Changeset 1802

Timestamp:

04/14/07 15:30:11 (21 months ago)

Author:

aturner

Message:

fix compile under strictly aligned systems. make test works fine.
fixes #141

Location:

trunk/src/tcpedit

Files:

• plugins/dlt_plugins-int.h (modified) (1 diff)
• plugins/dlt_plugins.c (modified) (1 diff)
• plugins/dlt_utils.c (modified) (1 diff)
• tcpedit-int.h (modified) (1 diff)
• tcpedit.c (modified) (2 diffs)

trunk/src/tcpedit/plugins/dlt_plugins-int.h

@@ -108 +108 @@
     tcpedit_t *tcpedit;                 /* pointer to our tcpedit context */
 #ifdef FORCE_ALIGN
-    u_char *ipbuff;                     /* pointer for L3 buffer on strictly aligned systems */
+    u_char *l3buff;                     /* pointer for L3 buffer on strictly aligned systems */
 #endif
     tcpeditdlt_plugin_t *plugins;       /* registered plugins */

trunk/src/tcpedit/plugins/dlt_plugins.c

@@ -394 +394 @@
     if (ctx->decoder != NULL)
         ctx->decoder->plugin_cleanup(ctx);
-        
+
 #ifdef FORCE_ALIGN
     free(ctx->l3buff);

trunk/src/tcpedit/plugins/dlt_utils.c

@@ -252 +252 @@
      * we can't edit the packet at layer 3 or above beyond this point
      */
-     memcpy((&(*packet)[l2len]), l3data, pktlen - l2len);
+     memcpy((&(packet)[l2len]), l3data, pktlen - l2len);
 #endif
     return packet;

trunk/src/tcpedit/tcpedit-int.h

@@ -48 +48 @@
     char errstr[TCPEDIT_ERRSTR_LEN];
     char warnstr[TCPEDIT_ERRSTR_LEN];
+#ifdef FORCE_ALIGN    
+    u_char *l3buff;
+#endif
 };
 

trunk/src/tcpedit/tcpedit.c

@@ -232 +232 @@
             pcap_datalink_val_to_name(dlt));
 
-            
 #ifdef FORCE_ALIGN
-    tcpedit->runtime.ipbuff = (u_char *)safe_malloc(MAXPACKET);
+    tcpedit->runtime.l3buff = (u_char *)safe_malloc(MAXPACKET);
 #endif
 
@@ -384 +383 @@
     /* free buffer if required */
 #ifdef FORCE_ALIGN
-    free(tcpedit->runtime.ipbuff);
+    free(tcpedit->runtime.l3buff);
 #endif