Changeset 21864 in vbox

Timestamp:

Jul 29, 2009 2:09:25 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50503

Message:

NAT: globals

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_ftp.c (modified) (2 diffs)
• libalias/alias_mod.c (modified) (11 diffs)
• libalias/alias_mod.h (modified) (1 diff)
• libalias/alias_nbt.c (modified) (2 diffs)
• slirp.c (modified) (2 diffs)
• slirp.h (modified) (1 diff)
• slirp_state.h (modified) (2 diffs)

trunk/src/VBox/Devices/Network/slirp/libalias/alias_ftp.c

@@ -150 +150 @@
 mod_handler(module_t mod, int type, void *data)
 #else
-static int ftp_alias_handler(int type);
+static int ftp_alias_handler(PNATState pData, int type);
 
 int
-ftp_alias_load(void)
-{
-    return ftp_alias_handler(MOD_LOAD);
+ftp_alias_load(PNATState pData)
+{
+    return ftp_alias_handler(pData, MOD_LOAD);
 }
 
 int
-ftp_alias_unload(void)
-{
-    return ftp_alias_handler(MOD_UNLOAD);
+ftp_alias_unload(PNATState pData)
+{
+    return ftp_alias_handler(pData, MOD_UNLOAD);
 }
 static int
-ftp_alias_handler(int type)
+ftp_alias_handler(PNATState pData, int type)
 #endif
 {
@@ -180 +180 @@
     case MOD_LOAD:
         error = 0;
+#ifdef VBOX
+        LibAliasAttachHandlers(pData, handlers);
+#else
         LibAliasAttachHandlers(handlers);
+#endif
         break;
     case MOD_UNLOAD:
         error = 0;
+#ifdef VBOX
+        LibAliasDetachHandlers(pData, handlers);
+#else
         LibAliasDetachHandlers(handlers);
+#endif
         break;
     default:

trunk/src/VBox/Devices/Network/slirp/libalias/alias_mod.c

@@ -52 +52 @@
 #include "alias_mod.h"
 #endif
+
+/* Protocol and userland module handlers chains. */
+LIST_HEAD(handler_chain, proto_handler) handler_chain = LIST_HEAD_INITIALIZER(foo);
 #else /* !VBOX */
 # include <slirp.h>
@@ -57 +60 @@
 # include "alias_mod.h"
 #endif /* VBOX */
-
-/* Protocol and userland module handlers chains. */
-LIST_HEAD(handler_chain, proto_handler) handler_chain = LIST_HEAD_INITIALIZER(foo);
 #ifdef _KERNEL
 struct rwlock   handler_rw;
@@ -138 +138 @@
 
 static int
+#ifdef VBOX
+_attach_handler(PNATState pData, struct proto_handler *p)
+#else
 _attach_handler(struct proto_handler *p)
+#endif
 {
     struct proto_handler *b = NULL;
@@ -162 +166 @@
 
 static int
+#ifdef VBOX
+_detach_handler(PNATState pData, struct proto_handler *p)
+#else
 _detach_handler(struct proto_handler *p)
+#endif
 {
     struct proto_handler *b, *b_tmp;;
@@ -177 +185 @@
 
 int
+#ifdef VBOX
+LibAliasAttachHandlers(PNATState pData, struct proto_handler *_p)
+#else
 LibAliasAttachHandlers(struct proto_handler *_p)
+#endif
 {
     int i, error = -1;
@@ -185 +197 @@
         if (*((int *)&_p[i]) == EOH) 
             break;
+#ifdef VBOX
+        error = _attach_handler(pData, &_p[i]);
+#else
         error = _attach_handler(&_p[i]);
+#endif
         if (error != 0) 
             break;
@@ -194 +210 @@
 
 int
+#ifdef VBOX
+LibAliasDetachHandlers(PNATState pData, struct proto_handler *_p)
+#else
 LibAliasDetachHandlers(struct proto_handler *_p)
+#endif
 {
     int i, error = -1;
@@ -202 +222 @@
         if (*((int *)&_p[i]) == EOH) 
             break;
+#ifdef VBOX
+        error = _detach_handler(pData, &_p[i]);
+#else
         error = _detach_handler(&_p[i]);
+#endif
         if (error != 0) 
             break;
@@ -211 +235 @@
 
 int
+#ifdef VBOX
+detach_handler(PNATState pData, struct proto_handler *_p)
+#else
 detach_handler(struct proto_handler *_p)
+#endif
 {
     int error = -1;
 
     LIBALIAS_WLOCK();
+#ifdef VBOX
+    error = _detach_handler(pData, _p);
+#else
     error = _detach_handler(_p);
+#endif
     LIBALIAS_WUNLOCK();
     return (error);
@@ -225 +257 @@
          struct alias_data *ad)
 {
+#ifdef VBOX
+    PNATState pData = la->pData;
+#endif
     struct proto_handler *p;
     int error = ENOENT;
@@ -242 +277 @@
 
 struct proto_handler *
+#ifdef VBOX
+first_handler(PNATState pData)
+#else
 first_handler(void)
+#endif
 {
     

trunk/src/VBox/Devices/Network/slirp/libalias/alias_mod.h

@@ -116 +116 @@
 void            handler_chain_init(void);
 void            handler_chain_destroy(void);
+#ifdef VBOX
+int             LibAliasAttachHandlers(PNATState pData, struct proto_handler *);
+int             LibAliasDetachHandlers(PNATState pData, struct proto_handler *);
+int             detach_handler(PNATState pData, struct proto_handler *);
+struct proto_handler *first_handler(PNATState pData);
+#else
 int             LibAliasAttachHandlers(struct proto_handler *);
 int             LibAliasDetachHandlers(struct proto_handler *);
 int             detach_handler(struct proto_handler *);
+struct proto_handler *first_handler(void);
+#endif
 int             find_handler(int8_t, int8_t, struct libalias *, 
-               struct ip *, struct alias_data *);
-struct proto_handler *first_handler(void);
+                             struct ip *, struct alias_data *);
 
 /* Functions used with dll module. */

trunk/src/VBox/Devices/Network/slirp/libalias/alias_nbt.c

@@ -169 +169 @@
 mod_handler(module_t mod, int type, void *data)
 #else /*!VBOX*/
-static int nbt_alias_handler(int type);
+static int nbt_alias_handler(PNATState pData, int type);
 
 int
-nbt_alias_load()
-{
-    return nbt_alias_handler(MOD_LOAD);
+nbt_alias_load(PNATState pData)
+{
+    return nbt_alias_handler(pData, MOD_LOAD);
 }
 
 int
-nbt_alias_unload()
-{
-    return nbt_alias_handler(MOD_UNLOAD);
+nbt_alias_unload(PNATState pData)
+{
+    return nbt_alias_handler(pData, MOD_UNLOAD);
 }
 static int
-nbt_alias_handler(int type)
+nbt_alias_handler(PNATState pData, int type)
 #endif /*VBOX*/
 {
@@ -215 +215 @@
     case MOD_LOAD:
         error = 0;
+#ifdef VBOX
+        LibAliasAttachHandlers(pData, handlers);
+#else
         LibAliasAttachHandlers(handlers);
+#endif
         break;
     case MOD_UNLOAD:
         error = 0;
+#ifdef VBOX
+        LibAliasDetachHandlers(pData, handlers);
+#else
         LibAliasDetachHandlers(handlers);
+#endif
         break;
     default:

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -557 +557 @@
         proxy_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
         LibAliasSetAddress(pData->proxy_alias, proxy_addr);
-        ftp_alias_load();
-        nbt_alias_load();
+        ftp_alias_load(pData);
+        nbt_alias_load(pData);
 
     }
@@ -657 +657 @@
     slirp_link_down(pData);
     slirp_release_dns_list(pData);
-    ftp_alias_unload();
-    nbt_alias_unload();
+    ftp_alias_unload(pData);
+    nbt_alias_unload(pData);
 #ifdef VBOX_WITH_SLIRP_ALIAS
     while(!LIST_EMPTY(&instancehead)) {

trunk/src/VBox/Devices/Network/slirp/slirp.h

@@ -407 +407 @@
 
 #ifdef VBOX_WITH_SLIRP_ALIAS
-int ftp_alias_load(void);
-int ftp_alias_unload(void);
-int nbt_alias_load(void);
-int nbt_alias_unload(void);
+int ftp_alias_load(PNATState);
+int ftp_alias_unload(PNATState);
+int nbt_alias_load(PNATState);
+int nbt_alias_unload(PNATState);
 #endif /*VBOX_WITH_SLIRP_ALIAS*/
 

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -229 +229 @@
     LIST_HEAD(RT_NOTHING, libalias) instancehead;
     struct libalias *proxy_alias;
+    LIST_HEAD(handler_chain, proto_handler) handler_chain;
 #endif
 
@@ -315 +316 @@
 #ifndef VBOX_SLIRP_ALIAS
 # define alias_addr pData->alias_addr
+#else
+# define handler_chain pData->handler_chain
 #endif
 #define special_addr pData->special_addr