Changeset 1742

Timestamp:

03/21/07 21:34:13 (22 months ago)

Author:

aturner

Message:

switch to using interface alias lookup code. refs #113

Location:

trunk/src

Files:

• tcpbridge.c (modified) (3 diffs, 1 prop)
• tcpreplay.c (modified) (6 diffs, 1 prop)
• tcpreplay_opts.def (modified) (1 diff)

trunk/src/tcpbridge.c

@@ -1 @@
-/* $Id: tcpbridge.c 1573 2006-08-05 20:26:08Z aturner $ */
+/* $Id$ */
 
 /*
@@ -164 +164 @@
 {
     char ebuf[SENDPACKET_ERRBUF_SIZE];
+    char *intname;
+    interface_list_t *intlist = get_interface_list();
+
     
 #ifdef DEBUG
@@ -189 +192 @@
         options.limit_send = OPT_VALUE_LIMIT; /* default is -1 */
 
-    options.intf1 = safe_strdup(OPT_ARG(INTF1));
-
-    if (HAVE_OPT(INTF2)) 
-        options.intf2 = safe_strdup(OPT_ARG(INTF2));
-
+
+    if ((intname = get_interface(intlist, OPT_ARG(INTF1))) == NULL)
+        errx(1, "Invalid interface name/alias: %s", OPT_ARG(INTF1));
+    
+    options.intf1 = safe_strdup(intname);
+
+    if (HAVE_OPT(INTF2)) {
+        if ((intname = get_interface(intlist, OPT_ARG(INTF2))) == NULL)
+            errx(1, "Invalid interface name/alias: %s", OPT_ARG(INTF2));
+    
+        options.intf2 = safe_strdup(intname);
+    }
     
 

trunk/src/tcpreplay.c

@@ -1 @@
-/* $Id: tcpreplay.c 1556 2006-07-31 06:12:01Z aturner $ */
+/* $Id$ */
 
 /*
@@ -157 +157 @@
     dlt = sendpacket_get_dlt(options.intf1);
     if ((dlt > 0) && (dlt != pcap_datalink(pcap)))
-        warnx("%s DLT does not match that of the outbound interface: %s", path, options.intf1->device);
+        warnx("%s DLT (%s) does not match that of the outbound interface: %s (%s)", 
+            path, pcap_datalink_val_to_name(pcap_datalink(pcap)), 
+            options.intf1->device, pcap_datalink_val_to_name(dlt));
         
     send_packets(pcap);
@@ -205 +207 @@
 post_args(void)
 {
-    char *temp;
+    char *temp, *intname;
     char ebuf[SENDPACKET_ERRBUF_SIZE];
     int int1dlt, int2dlt;
-    
+    interface_list_t *intlist = get_interface_list();
+
 
 #ifdef DEBUG
@@ -255 +258 @@
         warn("--pktlen may cause problems.  Use with caution.");
     
-    options.intf1_name = (char *)safe_malloc(strlen(OPT_ARG(INTF1)) + 1);
-    strncpy(options.intf1_name, OPT_ARG(INTF1), strlen(OPT_ARG(INTF1)));
+    
+    if ((intname = get_interface(intlist, OPT_ARG(INTF1))) == NULL)
+        errx(1, "Invalid interface name/alias: %s", OPT_ARG(INTF1));
+    
+    options.intf1_name = safe_strdup(intname);
     
     /* open interfaces for writing */
@@ -265 +271 @@
     
     if (HAVE_OPT(INTF2)) {
-        options.intf2_name = (char *)safe_malloc(strlen(OPT_ARG(INTF2)) + 1);
-        strncpy(options.intf2_name, OPT_ARG(INTF2), strlen(OPT_ARG(INTF2)));
+        if ((intname = get_interface(intlist, OPT_ARG(INTF2))) == NULL)
+            errx(1, "Invalid interface name/alias: %s", OPT_ARG(INTF2));
+            
+        options.intf2_name = safe_strdup(intname);
         
         /* open interface for writing */
@@ -274 +282 @@
         int2dlt = sendpacket_get_dlt(options.intf2);
         if (int2dlt != int1dlt)
-            errx(1, "DLT type missmatch for %s and %s", options.intf1_name, options.intf2_name);
+            errx(1, "DLT type missmatch for %s (%s) and %s (%s)", 
+                options.intf1_name, pcap_datalink_val_to_name(int1dlt), 
+                options.intf2_name, pcap_datalink_val_to_name(int2dlt));
     }
 

trunk/src/tcpreplay_opts.def

@@ -196 +196 @@
         flag-code       = <<- EOFlag
         
-    char ebuf[PCAP_ERRBUF_SIZE];
-    pcap_if_t *pcap_if, *pcap_if_ptr;
-        int i = 0;
-
-    if (pcap_findalldevs(&pcap_if, ebuf) < 0)
-        errx(1, "Error: %s", ebuf);
-            
-    pcap_if_ptr = pcap_if;
-    printf("%s", "Available network interfaces:\n");
-#ifdef HAVE_WIN32  /* Win32 has alias/name/description */
-        printf("Alias\tName\n");
-#else
-        /* Unix just has a warning about being root */
-        if (geteuid() != 0)
-                printf("Warning!  Need to run as root to get complete list.\n");
-#endif
-
-    while (pcap_if_ptr != NULL) {
-        if (! pcap_if_ptr->flags & PCAP_IF_LOOPBACK) {
-#ifdef HAVE_WIN32
-            printf("%%%d\t%s\n\t%s\n", i, pcap_if_ptr->name, pcap_if_ptr->description);
-#else
-                        printf("%s\n", pcap_if_ptr->name);
-#endif
-                        i ++;
-                }
-        pcap_if_ptr = pcap_if_ptr->next;
-    }
-    pcap_freealldevs(pcap_if);
+        interface_list_t *list = get_interface_list();
+        list_interfaces(list);
+        free(list);
     exit(0);