Changeset 1658

Timestamp:

07/21/08 00:38:19 (2 months ago)

Author:

common

Message:

libemu

• to simplify profiling, create emu_profile_argument_add_sockaddr_ptr for use in connect&bind hooks
  

Files:

• libemu/trunk/include/emu/environment/emu_profile.h (modified) (2 diffs)
• libemu/trunk/src/environment/emu_profile.c (modified) (3 diffs)

libemu/trunk/include/emu/environment/emu_profile.h

@@ -26 +26 @@
- *******************************************************************************/
-
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
-
-#include "emu/emu_list.h"
@@ -154 +159 @@
-
-void *emu_profile_function_argument_get(struct emu_profile_function *function, int argc);
-
+
+
+
+
+

libemu/trunk/src/environment/emu_profile.c

@@ -29 +29 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-
-
-
+
-
-
-#include "emu/environment/emu_profile.h"
+
+
+
-
-/*
@@ -166 +166 @@
-
-    struct emu_profile_argument *argument = emu_profile_argument_new(render_string, argtype, argname);
+        if (value == NULL)
+                value = "";
-        argument->value.tchar = strdup(value);
-        emu_profile_argument_add(profile, argument);
@@ -203 +205 @@
-}
-
+void emu_profile_argument_add_sockaddr_ptr(struct emu_profile *profile, const char *name, uint32_t ptr, struct sockaddr sa)
+{
+
+        if ( sa.sa_family == AF_INET )
+        {                                                                                          
+                struct sockaddr_in *si = (struct sockaddr_in *)&sa;                                    
+                emu_profile_argument_add_ptr(profile, "sockaddr_in *", (char*)name, ptr);               
+                emu_profile_argument_struct_start(profile, "", "");                                    
+                emu_profile_argument_add_short(profile, "short", "sin_family", si->sin_family);        
+                emu_profile_argument_add_port(profile, "unsigned short", "sin_port", si->sin_port);    
+                emu_profile_argument_struct_start(profile, "in_addr", "sin_addr");                     
+                emu_profile_argument_add_ip(profile, "unsigned long", "s_addr", si->sin_addr.s_addr);  
+                emu_profile_argument_struct_end(profile);                                              
+                emu_profile_argument_add_string(profile, "char", "sin_zero", "       ");               
+                emu_profile_argument_struct_end(profile);                                              
+
+        }
+        else
+        {                                                                                          
+                emu_profile_argument_struct_start(profile, "sockaddr *", "name");                      
+                emu_profile_argument_struct_end(profile);                                              
+        }                                                                                          
+
+}
-
-struct emu_profile_function *emu_profile_function_new()