Changeset 25485

Timestamp:

05/13/08 19:41:09 (6 months ago)

Author:

bonefish

Message:

* Made libnetapi a separate library again.
* The built-in services are no longer added as resource to libnetwork,

but as attribute. This removes the libbe dependency.

Location:

haiku/trunk

Files:

• build/jam/HaikuImage (modified) (2 diffs)
• src/kits/network/Jamfile (modified) (3 diffs)
• src/kits/network/dns/irs/lcl_sv.cpp (modified) (8 diffs)
• src/kits/network/libnetapi/Jamfile (modified) (1 diff)

haiku/trunk/build/jam/HaikuImage

@@ -65 +65 @@
 ;
 BEOS_SYSTEM_LIBS = libbe.so $(HAIKU_LIBSTDC++) libmedia.so libtracker.so
-        libtranslation.so libnetwork.so libdebug.so libbsd.so libmail.so
-        libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so libmidi2.so
-        libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
+        libtranslation.so libnetapi.so libnetwork.so libdebug.so libbsd.so
+        libmail.so libtextencoding.so libz.so libfreetype.so libpng.so libmidi.so
+        libmidi2.so libdevice.so libgame.so libscreensaver.so <revisioned>libroot.so
         $(X86_ONLY)libGL.so libfluidsynth.so liblpsolve55.so liblinprog.so libalm.so
         libilmimf.so
@@ -191 +191 @@
 # libnetwork.so replaces quite a few libraries
 BEOS_SYSTEM_LIBS_LIBNETWORK_ALIASES
-        = libsocket.so libbind.so libnet.so libnetapi.so libbnetapi.so ;
+        = libsocket.so libbind.so libnet.so ;
 
 local lib ;

haiku/trunk/src/kits/network/Jamfile

@@ -3 +3 @@
 UsePrivateHeaders libroot net shared ;
 UsePrivateKernelHeaders ;
-
-local services = [ FGristFiles services ] ;
-SEARCH on $(services) = [ FDirName $(SUBDIR) dns defaults ] ;
-AddFileDataResource libnetwork.so : CSTR:201:services : $(services) ;
 
 SharedLibrary libnetwork.so :
@@ -14 +10 @@
         r5_compatibility.cpp
         :
-        <libnetwork_netapi>netapi.o
-
         <libnetwork_dns>dns_dst.o
         <libnetwork_dns>dns_inet.o
@@ -23 +17 @@
         <libnetwork_dns>dns_resolv.o
         <libnetwork_dns>dns_private.o
+;
 
-        be
-;
+local services = [ FGristFiles services ] ;
+SEARCH on $(services) = [ FDirName $(SUBDIR) dns defaults ] ;
+AddFileDataAttribute libnetwork.so : services : string : $(services) ;
 
 SubInclude HAIKU_TOP src kits network dns ;

haiku/trunk/src/kits/network/dns/irs/lcl_sv.cpp

@@ -64 +64 @@
 #include "port_after.h"
 
-#include <File.h>
-#include <Resources.h>
-#include <TypeConstants.h>
-
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -81 +77 @@
 #include <stdlib.h>
 
+#include <fs_attr.h>
+#include <image.h>
+#include <TypeConstants.h>
+
 
 #define IRS_SV_MAXALIASES       35
@@ -87 +87 @@
         FILE*   file;
         char    line[BUFSIZ+1];
-        char*   resource_file;
-        char*   resource_end;
-        char*   resource_line;
         struct servent servent;
         char*   aliases[IRS_SV_MAXALIASES];
@@ -116 +113 @@
 get_next_line(struct service_private* service)
 {
-        if (service->file != NULL)
-                return fgets(service->line, BUFSIZ, service->file);
-        if (service->resource_file == NULL)
-                return NULL;
-
-        char* line = service->resource_line;
-        while (line < service->resource_end
-                && line[0]
-                && line[0] != '\n')
-                line++;
-
-        if (service->resource_line >= service->resource_end
-                || service->resource_line == line)
-                return NULL;
-
-        strlcpy(service->line, service->resource_line,
-                min_c(line + 1 - service->resource_line, BUFSIZ));
-        service->resource_line = line + 1;
-
-        return service->line;
+        if (service->file == NULL)
+                return NULL;
+        return fgets(service->line, BUFSIZ, service->file);
 }
 
@@ -150 +130 @@
                 fclose(service->file);
 
-        free(service->resource_file);
         memput(service, sizeof *service);
         memput(sv, sizeof *sv);
@@ -169 +148 @@
 
         if ((service->file = fopen(_PATH_SERVICES, "r")) != NULL) {
-                if (fcntl(fileno(service->file), F_SETFD, 1) == 0)
+                if (fcntl(fileno(service->file), F_SETFD, FD_CLOEXEC) == 0)
                         return;
 
@@ -176 +155 @@
         }
 
-        // opening the standard file has file has failed, use resources
-
-        if (service->resource_file != NULL) {
-                service->resource_line = service->resource_file;
-                return;
-        }
-
+        // opening the standard file has file has failed, use the attribute
+
+        // find our library image
+        addr_t addressInImage = (addr_t)&sv_rewind;
+        const char* path = NULL;
         image_info info;
-        if (find_own_image(&info) < B_OK)
-                return;
-
-        BFile file;
-        if (file.SetTo(info.name, B_READ_ONLY) < B_OK)
-                return;
-
-        BResources resources(&file);
-        if (resources.InitCheck() < B_OK)
-                return;
-
-        size_t size;
-        const void* data = resources.LoadResource(B_STRING_TYPE, "services", &size);
-        if (data == NULL)
-                return;
-
-        service->resource_file = (char *)malloc(size);
-        if (service->resource_file == NULL)
-                return;
-
-        memcpy(service->resource_file, data, size);
-        service->resource_line = service->resource_file;
-        service->resource_end = service->resource_file + size;
+        int32 cookie;
+
+        while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
+                if (addressInImage >= (addr_t)info.text
+                        && addressInImage < (addr_t)info.text + info.text_size) {
+                        path = info.name;
+                        break;
+                }
+        }
+
+        if (path == NULL)
+                return;
+
+        // open the library
+        int libraryFD = open(path, O_RDONLY);
+        if (libraryFD < 0)
+                return;
+
+        // open the attribute
+        int attrFD = fs_open_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;
 }
 
@@ -216 +206 @@
         char *p, *cp, **q;
 
-        if (service->file == NULL && service->resource_file == NULL)
+        if (service->file == NULL)
                 sv_rewind(sv);
 
-        if (service->file == NULL && service->resource_file == NULL)
+        if (service->file == NULL)
                 return NULL;
 

haiku/trunk/src/kits/network/libnetapi/Jamfile

@@ -44 +44 @@
                 boot home Desktop haiku-networkingkit lib ;
 } else {
-        MergeObject <libnetwork_netapi>netapi.o :
+        SharedLibrary libnetapi.so :
                 $(netapi_sources)
+                : be $(TARGET_NETWORK_LIBS)
         ;
 }