Changeset 22894 in vbox

Timestamp:

Sep 10, 2009 3:33:08 AM (15 years ago)

Author:

vboxsync

Message:

NAT: BSD mbuf's related changeset.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ext.h (added)
• slirp.h (modified) (3 diffs)

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

@@ -264 +264 @@
 
 /* cksum.c */
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
 int cksum(struct mbuf *m, int len);
+#else
+typedef uint16_t u_short;
+typedef unsigned int u_int;
+#include "in_cksum.h"
+#endif
 
 /* if.c */
@@ -358 +364 @@
 
 # ifdef alias_addr
-#  error  alias_addr has already defined!!!
+#  ifndef VBOX_SLIRP_BSD
+#   error alias_addr has already defined!!!
+#  else
+#   undef alias_addr
+#  endif
 # endif
 
@@ -390 +400 @@
 # define fprintf vbox_slirp_fprintf
 # define printf vbox_slirp_printf
-static void vbox_slirp_printV(char *format, va_list args)
+# include "ext.h"
+#endif /*VBOX_SLIRP_ALIAS*/
+
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
+/* @todo might be useful to make it configurable, 
+ * especially in terms of Intnet behind NAT
+ */
+# define maxusers 32 
+# define max_protohdr 0
+/* @todo (r=vvl) for now ignore value,
+ * latter here should be fetching of tuning parameters entered
+ */
+# define TUNABLE_INT_FETCH(name, pval) do { } while (0)
+# define SYSCTL_PROC(a0, a1, a2, a3, a4, a5, a6, a7, a8)
+# define SYSCTL_STRUCT(a0, a1, a2, a3, a4, a5, a6)
+# define SYSINIT(a0, a1, a2, a3, a4)
+# define sysctl_handle_int(a0, a1, a2, a3) 0
+# define EVENTHANDLER_INVOKE(a) do{}while(0)
+# define EVENTHANDLER_REGISTER(a0, a1, a2, a3) do{}while(0)
+# define KASSERT AssertMsg
+
+struct dummy_req
 {
-    char buffer[1024];
-    memset(buffer, 0, 1024);
-    RTStrPrintfV(buffer, 1024, format, args);
-
-# if defined(DEBUG_vvl)
-    LogRel(("NAT:ALIAS: %s\n", buffer));
-# else
-    Log2(("NAT:ALIAS: %s\n", buffer));
-# endif
-}
-static void vbox_slirp_printf(char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    vbox_slirp_printV(format, args);
-    va_end(args);
-}
-static void vbox_slirp_fprintf(void *ignored, char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    vbox_slirp_printV(format, args);
-    va_end(args);
-}
-#endif /*VBOX_SLIRP_ALIAS*/
+    void *newptr;
+};
+  
+#define SYSCTL_HANDLER_ARGS PNATState pData, void *oidp, struct dummy_req *req
+
+void    mbuf_init(void *);
+# define cksum(m, len) in_cksum_skip((m), (len), 0)
+#endif
 
 int ftp_alias_load(PNATState);