Changeset 22451 in vbox

Timestamp:

Aug 26, 2009 7:53:31 AM (15 years ago)

Author:

vboxsync

Message:

NAT/libalias: no-static

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_ftp.c (modified) (3 diffs)
• libalias/alias_nbt.c (modified) (3 diffs)
• slirp_state.h (modified) (2 diffs)

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

@@ -143 +143 @@
 };
 #else /* !VBOX */
-static struct proto_handler handlers[2];
+#define handlers pData->ftp_module
 #endif /* VBOX */
 
@@ -169 +169 @@
     int error;
 #ifdef VBOX
+    handlers = RTMemAllocZ(2 * sizeof(struct proto_handler));
     handlers[0].pri = 80;
     handlers[0].dir = OUT;
@@ -190 +191 @@
 #ifdef VBOX
         LibAliasDetachHandlers(pData, handlers);
+        RTMemFree(handlers);
+        handlers = NULL;
 #else
         LibAliasDetachHandlers(handlers);

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

@@ -162 +162 @@
 };
 #else /* !VBOX */
-static struct proto_handler handlers[4];
+#define handlers pData->nbt_module 
 #endif /*VBOX*/
 
@@ -188 +188 @@
     int error;
 #ifdef VBOX
-    
+    handlers = RTMemAllocZ(4 * sizeof(struct proto_handler));
     handlers[0].pri = 130;
     handlers[0].dir = IN|OUT;
@@ -225 +225 @@
 #ifdef VBOX
         LibAliasDetachHandlers(pData, handlers);
+        RTMemFree(handlers);
+        handlers = NULL;
 #else
         LibAliasDetachHandlers(handlers);

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

@@ -90 +90 @@
 };
 LIST_HEAD(port_forward_rule_list, port_forward_rule);
+
+/* forward declaration */
+struct proto_handler;
 
 /** Main state/configuration structure for slirp NAT. */
@@ -249 +252 @@
     struct port_forward_rule_list port_forward_rule_head;
     int port_forwarding_activated;
+    /*libalis modules' handlers*/
+    struct proto_handler *ftp_module;
+    struct proto_handler *nbt_module;
 
 #define PROFILE_COUNTER(name, dsc)     STAMPROFILE Stat ## name