Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnetwork: Remove lcl_sv.cpp.

Browse Source 
This has not been included in the build for years, probably since the
initial NetResolv merge. Services are now returned via the "protocols"
file, and getservent() has no need for these utility functions.

Change-Id: If18bdd9593463b38a9aaedb7a621d0ddc15530e4
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6878
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Augustin Cavalier 2023-08-31 17:09:00 -04:00 committed by waddlesplash
parent 4dcc1ed654
commit ac30bc0ef6
3 changed files with 0 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/system/libnetwork/Jamfile
View File

@ -3,9 +3,6 @@ SubDir HAIKU_TOP src system libnetwork ;
UsePrivateHeaders libroot net shared ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
local services = [ FGristFiles services ] ;
SEARCH on $(services) = [ FDirName $(SUBDIR) netresolv defaults ] ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
@ -27,8 +24,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
[ MultiArchDefaultGristFiles libutil.a libbsd.so ]
[ TargetLibsupc++ ]
;
AddFileDataAttribute $(libnetwork) : services : string : $(services) ;
}
}

47
src/system/libnetwork/netresolv/defaults/services
View File

@ -1,47 +0,0 @@
# Copyright 2006, Haiku, Inc. All Rights Reserved.
# Licensed under the terms of the MIT license.
#
# This file only includes ports in the well known port range, and
# is also not complete - it only includes commonly used ports
# See RFC 1700 for a full list.
#
tcpmux 1/tcp
echo 7/tcp
echo 7/udp
discard 9/tcp sink null
discard 9/udp sink null
daytime 13/tcp
daytime 13/udp
ftp-data 20/tcp
ftp 21/tcp
ssh 22/tcp
telnet 23/tcp
smtp 25/tcp mail
time 37/tcp timserver
time 37/udp timserver
name 42/udp nameserver
whois 43/tcp nicname
domain 53/tcp
domain 53/udp
bootps 67/udp dhcps
bootpc 68/udp dhcpc
tftp 69/udp
finger 79/tcp
http 80/tcp www www-http
kerberos 88/tcp kdc
kerberos 88/udp kdc
pop3 110/tcp
nntp 119/tcp
ntp 123/tcp
ntp 123/udp
netbios-ns 137/tcp
netbios-ns 137/udp
netbios-dgm 138/tcp
netbios-dgm 138/udp
netbios-ssn 139/tcp
netbios-ssn 139/udp
imap 143/tcp imap2 imap4
irc 194/tcp
ldap 389/tcp
ldap 389/udp
https 443/tcp

351
src/system/libnetwork/netresolv/irs/lcl_sv.cpp
View File

@ -1,351 +0,0 @@
/*
* Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
/*
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (c) 1996-1999 by Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "port_before.h"
extern "C" {
// libbind's internal headers aren't C++ safe
#include "irs_p.h"
#include "lcl_p.h"
#define private private_data
#include <irs.h>
#undef private
#include <isc/memcluster.h>
}
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <resolv.h>
#include "port_after.h"
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <FindDirectory.h>
#include <fs_attr.h>
#include <image.h>
#include <TypeConstants.h>
#define IRS_SV_MAXALIASES 35
struct service_private {
FILE* file;
char line[BUFSIZ + 1];
struct servent servent;
char* aliases[IRS_SV_MAXALIASES];
};
static status_t
find_own_image(image_info* _info)
{
int32 cookie = 0;
image_info info;
while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
if (((addr_t)info.text <= (addr_t)find_own_image
&& (addr_t)info.text + (size_t)info.text_size
> (addr_t)find_own_image)) {
// found us
*_info = info;
return B_OK;
}
}
return B_ENTRY_NOT_FOUND;
}
static char*
get_next_line(struct service_private* service)
{
if (service->file == NULL)
return NULL;
return fgets(service->line, BUFSIZ, service->file);
}
// #pragma mark -
static void
sv_close(struct irs_sv *sv)
{
struct service_private *service = (struct service_private *)sv->private_data;
if (service->file)
fclose(service->file);
memput(service, sizeof *service);
memput(sv, sizeof *sv);
}
static void
sv_rewind(struct irs_sv *sv)
{
struct service_private *service
= (struct service_private *)sv->private_data;
if (service->file) {
if (fseek(service->file, 0L, SEEK_SET) == 0)
return;
fclose(service->file);
service->file = NULL;
}
char path[PATH_MAX];
if (find_directory(B_SYSTEM_DATA_DIRECTORY, -1, false, path, sizeof(path))
== B_OK) {
strlcat(path, "/network/services", sizeof(path));
if ((service->file = fopen(path, "r")) != NULL) {
if (fcntl(fileno(service->file), F_SETFD, FD_CLOEXEC) == 0)
return;
fclose(service->file);
service->file = NULL;
}
}
// opening the standard file has file has failed, use the attribute
// find our library image
image_info info;
if (find_own_image(&info) != B_OK)
return;
// open the library
int libraryFD = open(info.name, O_RDONLY);
if (libraryFD < 0)
return;
// open the attribute
int attrFD = fs_fopen_attr(libraryFD, "services", B_STRING_TYPE, O_RDONLY);
close(libraryFD);
if (attrFD < 0)
return;
// attach it to a FILE
service->file = fdopen(attrFD, "r");
if (service->file == NULL) {
close(attrFD);
return;
}
if (fcntl(fileno(service->file), F_SETFD, FD_CLOEXEC) == 0)
return;
fclose(service->file);
service->file = NULL;
}
static struct servent *
sv_next(struct irs_sv *sv)
{
struct service_private *service = (struct service_private *)sv->private_data;
char *p, *cp, **q;
if (service->file == NULL)
sv_rewind(sv);
if (service->file == NULL)
return NULL;
again:
if ((p = get_next_line(service)) == NULL)
return NULL;
if (*p == '#')
goto again;
service->servent.s_name = p;
while (*p && *p != '\n' && *p != ' ' && *p != '\t' && *p != '#')
++p;
if (*p == '\0' || *p == '#' || *p == '\n')
goto again;
*p++ = '\0';
while (*p == ' ' || *p == '\t')
p++;
if (*p == '\0' || *p == '#' || *p == '\n')
goto again;
service->servent.s_port = htons((u_short)strtol(p, &cp, 10));
if (cp == p || (*cp != '/' && *cp != ','))
goto again;
p = cp + 1;
service->servent.s_proto = p;
q = service->servent.s_aliases = service->aliases;
while (*p && *p != '\n' && *p != ' ' && *p != '\t' && *p != '#')
++p;
while (*p == ' ' || *p == '\t') {
*p++ = '\0';
while (*p == ' ' || *p == '\t')
++p;
if (*p == '\0' || *p == '#' || *p == '\n')
break;
if (q < &service->aliases[IRS_SV_MAXALIASES - 1])
*q++ = p;
while (*p && *p != '\n' && *p != ' ' && *p != '\t' && *p != '#')
++p;
}
*p = '\0';
*q = NULL;
return &service->servent;
}
static struct servent *
sv_byname(struct irs_sv *sv, const char *name, const char *protocol)
{
struct servent *servent;
sv_rewind(sv);
while ((servent = sv_next(sv))) {
char **alias;
if (!strcmp(name, servent->s_name))
goto gotname;
for (alias = servent->s_aliases; *alias; alias++) {
if (!strcmp(name, *alias))
goto gotname;
}
continue;
gotname:
if (protocol == NULL || strcmp(servent->s_proto, protocol) == 0)
break;
}
return servent;
}
static struct servent *
sv_byport(struct irs_sv *sv, int port, const char *protocol)
{
struct servent *servent;
sv_rewind(sv);
while ((servent = sv_next(sv))) {
if (servent->s_port != port)
continue;
if (protocol == NULL || strcmp(servent->s_proto, protocol) == 0)
break;
}
return servent;
}
static void
sv_minimize(struct irs_sv *sv)
{
struct service_private *service = (struct service_private *)sv->private_data;
if (service->file != NULL) {
fclose(service->file);
service->file = NULL;
}
}
// #pragma mark -
extern "C" struct irs_sv *
irs_lcl_sv(struct irs_acc */*acc*/)
{
struct service_private *service;
struct irs_sv *sv;
if ((sv = (irs_sv *)memget(sizeof *sv)) == NULL) {
errno = ENOMEM;
return NULL;
}
if ((service = (service_private *)memget(sizeof *service)) == NULL) {
memput(sv, sizeof *sv);
errno = ENOMEM;
return NULL;
}
memset(service, 0, sizeof *service);
sv->private_data = service;
sv->close = sv_close;
sv->next = sv_next;
sv->byname = sv_byname;
sv->byport = sv_byport;
sv->rewind = sv_rewind;
sv->minimize = sv_minimize;
sv->res_get = NULL;
sv->res_set = NULL;
return sv;
}