Changeset 1536 for trunk/src/common/sendpacket.c

Timestamp:

07/28/06 22:42:30 (2 years ago)

Author:

aturner

Message:

fix libnet support
refs #4

Files:

• trunk/src/common/sendpacket.c (modified) (5 diffs)

trunk/src/common/sendpacket.c

@@ -57 +57 @@
   * Please note that some of this code was copied from Libnet 1.1.3
   */
+
+#include "config.h"
 #include "defines.h"
 #include "common.h"
@@ -108 +110 @@
 
 #elif defined HAVE_LIBNET
-#include <libnet.h>
 static sendpacket_t *sendpacket_open_libnet(const char *, char *);
 static struct tcpr_ether_addr *get_hwaddr_libnet(sendpacket_t *);
@@ -182 +183 @@
         goto TRY_SEND_AGAIN;
     } else if (retcode < 0) {
-        sendpacket_seterr(sp, "Error with libnet_adv_write_link: %s", libnet_geterr(sp->lnet));
+        sendpacket_seterr(sp, "Error with libnet_adv_write_link: %s", libnet_geterror(sp->handle.lnet));
     }
 #endif
@@ -345 +346 @@
     assert(errbuf);
     
-    if ((lnet = libnet_init(LIBNET_LINK_ADV, device, errbuf)) == NULL)
+    if ((sp->handle.lnet = libnet_init(LIBNET_LINK_ADV, device, errbuf)) == NULL)
         return NULL;
 
@@ -360 +361 @@
     assert(sp);
     
-    addr = (struct tcpr_ether_addr *)libnet_get_hwaddr(sp->lnet);
-    
-    if (ether == NULL) {
-        sendpacket_seterr(sp, "Error getting hwaddr via libnet: %s", libnet_geterr(sp->lnet));
-        return NULL
-    } 
-    
-    mempcy(sp->ether, addr, sizeof(struct tcpr_ether_addr));
+    addr = (struct tcpr_ether_addr *)libnet_get_hwaddr(sp->handle.lnet);
+    
+    if (addr == NULL) {
+        sendpacket_seterr(sp, "Error getting hwaddr via libnet: %s", libnet_geterror(sp->handle.lnet));
+        return NULL;
+    }
+    
+    memcpy(&sp->ether, addr, sizeof(struct tcpr_ether_addr));
     return(&sp->ether);
 }