Fixed some fatal networking bugs during the first run.

[udpgate.git] / src / packet.c

diff --git a/src/packet.c b/src/packet.c
index 2f38371..142c1bf 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -56,7 +56,7 @@ guint32 value_guint32_htonl=htonl(value_guint32);
 
        g_return_if_fail(gstring!=NULL);
 
-       g_assert(sizeof(value_guint32_htonl)==4);
+       g_assert(4==sizeof(value_guint32_htonl));
        packet_assembly_guint32(gstring,sizeof(value_guint32_htonl));
        packet_assembly_guint32(gstring,value_guint32_htonl);
 }
@@ -67,7 +67,7 @@ guint16 value_guint16_htonl=htons(value_guint16);
 
        g_return_if_fail(gstring!=NULL);
 
-       g_assert(sizeof(value_guint16_htonl)==4);
+       g_assert(2==sizeof(value_guint16_htonl));
        packet_assembly_guint32(gstring,sizeof(value_guint16_htonl));
        packet_assembly_guint16(gstring,value_guint16_htonl);
 }
@@ -76,7 +76,7 @@ static void packet_assembly_data_string(GString *gstring,const gchar *string)
 {
 size_t string_length;
 #ifndef G_DISABLE_ASSERT
-size_t gstring_len_orig;
+size_t gstring_length_orig;
 #endif /* !G_DISABLE_ASSERT */
 
        g_return_if_fail(gstring!=NULL);
@@ -85,11 +85,11 @@ size_t gstring_len_orig;
        string_length=strlen(string);
        packet_assembly_guint32(gstring,string_length);
 #ifndef G_DISABLE_ASSERT
-       gstring_len_orig=gstring->len;
+       gstring_length_orig=gstring->len;
 #endif /* !G_DISABLE_ASSERT */
        g_string_append(gstring,string);
 #ifndef G_DISABLE_ASSERT
-       g_assert(gstring_len_orig+string_length==gstring->len);
+       g_assert(gstring_length_orig+string_length==gstring->len);
 #endif /* !G_DISABLE_ASSERT */
 }
 
@@ -118,11 +118,11 @@ guint32 elem_type_uint32;
                }
 }
 
-void *packet_assembly(size_t *packet_len_pointer,GHashTable *values)
+void *packet_assembly(size_t *packet_length_pointer,GHashTable *values)
 {
 GString *gstring;
 
-       g_return_val_if_fail(packet_len_pointer!=NULL,NULL);
+       g_return_val_if_fail(packet_length_pointer!=NULL,NULL);
        g_return_val_if_fail(values!=NULL,NULL);
 
        gstring=g_string_new(NULL);
@@ -135,7 +135,7 @@ GString *gstring;
                        (GHFunc)packet_assembly_foreach,        /* func */
                        gstring);       /* user_data */
 
-       *packet_len_pointer=gstring->len;
+       *packet_length_pointer=gstring->len;
        return g_string_free(gstring,
                        FALSE); /* free_segment */
 }
@@ -260,7 +260,7 @@ guint16 value_guint16;
        return TRUE;
 }
 
-GHashTable *packet_disassembly(gconstpointer packet,size_t packet_len)
+GHashTable *packet_disassembly(gconstpointer packet,size_t packet_length)
 {
 GHashTable *r;
 gconstpointer packet_end;
@@ -269,11 +269,11 @@ GSList *items;
        g_return_val_if_fail(packet!=NULL,NULL);
 
        r=g_hash_table_new_full(
-                       g_int_hash,     /* hash_func */
-                       g_int_equal,    /* key_equal_func */
+                       g_direct_hash,  /* hash_func */
+                       g_direct_equal, /* key_equal_func */
                        NULL,   /* key_destroy_func */
                        packet_disassembly_value_destroy_func); /* value_destroy_func */
-       packet_end=packet+packet_len;
+       packet_end=packet+packet_length;
 
        if (packet+strlen(PACKET_HEADER)>packet_end) {
 err_g_hash_table_destroy_r: