diff options
Diffstat (limited to 'pcap-snoop.c')
| -rw-r--r-- | pcap-snoop.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/pcap-snoop.c b/pcap-snoop.c index 9bf0d261..7128f0b8 100644 --- a/pcap-snoop.c +++ b/pcap-snoop.c @@ -219,7 +219,7 @@ pcap_activate_snoop(pcap_t *p) p->fd = fd; memset(&sr, 0, sizeof(sr)); sr.sr_family = AF_RAW; - (void)strncpy(sr.sr_ifname, p->opt.source, sizeof(sr.sr_ifname)); + (void)strncpy(sr.sr_ifname, p->opt.device, sizeof(sr.sr_ifname)); if (bind(fd, (struct sockaddr *)&sr, sizeof(sr))) { /* * XXX - there's probably a particular bind error that @@ -246,19 +246,19 @@ pcap_activate_snoop(pcap_t *p) /* * XXX hack - map device name to link layer type */ - if (strncmp("et", p->opt.source, 2) == 0 || /* Challenge 10 Mbit */ - strncmp("ec", p->opt.source, 2) == 0 || /* Indigo/Indy 10 Mbit, + if (strncmp("et", p->opt.device, 2) == 0 || /* Challenge 10 Mbit */ + strncmp("ec", p->opt.device, 2) == 0 || /* Indigo/Indy 10 Mbit, O2 10/100 */ - strncmp("ef", p->opt.source, 2) == 0 || /* O200/2000 10/100 Mbit */ - strncmp("eg", p->opt.source, 2) == 0 || /* Octane/O2xxx/O3xxx Gigabit */ - strncmp("gfe", p->opt.source, 3) == 0 || /* GIO 100 Mbit */ - strncmp("fxp", p->opt.source, 3) == 0 || /* Challenge VME Enet */ - strncmp("ep", p->opt.source, 2) == 0 || /* Challenge 8x10 Mbit EPLEX */ - strncmp("vfe", p->opt.source, 3) == 0 || /* Challenge VME 100Mbit */ - strncmp("fa", p->opt.source, 2) == 0 || - strncmp("qaa", p->opt.source, 3) == 0 || - strncmp("cip", p->opt.source, 3) == 0 || - strncmp("el", p->opt.source, 2) == 0) { + strncmp("ef", p->opt.device, 2) == 0 || /* O200/2000 10/100 Mbit */ + strncmp("eg", p->opt.device, 2) == 0 || /* Octane/O2xxx/O3xxx Gigabit */ + strncmp("gfe", p->opt.device, 3) == 0 || /* GIO 100 Mbit */ + strncmp("fxp", p->opt.device, 3) == 0 || /* Challenge VME Enet */ + strncmp("ep", p->opt.device, 2) == 0 || /* Challenge 8x10 Mbit EPLEX */ + strncmp("vfe", p->opt.device, 3) == 0 || /* Challenge VME 100Mbit */ + strncmp("fa", p->opt.device, 2) == 0 || + strncmp("qaa", p->opt.device, 3) == 0 || + strncmp("cip", p->opt.device, 3) == 0 || + strncmp("el", p->opt.device, 2) == 0) { p->linktype = DLT_EN10MB; p->offset = RAW_HDRPAD(sizeof(struct ether_header)); ll_hdrlen = sizeof(struct ether_header); @@ -291,22 +291,22 @@ pcap_activate_snoop(pcap_t *p) p->dlt_list[1] = DLT_DOCSIS; p->dlt_count = 2; } - } else if (strncmp("ipg", p->opt.source, 3) == 0 || - strncmp("rns", p->opt.source, 3) == 0 || /* O2/200/2000 FDDI */ - strncmp("xpi", p->opt.source, 3) == 0) { + } else if (strncmp("ipg", p->opt.device, 3) == 0 || + strncmp("rns", p->opt.device, 3) == 0 || /* O2/200/2000 FDDI */ + strncmp("xpi", p->opt.device, 3) == 0) { p->linktype = DLT_FDDI; p->offset = 3; /* XXX yeah? */ ll_hdrlen = 13; - } else if (strncmp("ppp", p->opt.source, 3) == 0) { + } else if (strncmp("ppp", p->opt.device, 3) == 0) { p->linktype = DLT_RAW; ll_hdrlen = 0; /* DLT_RAW meaning "no PPP header, just the IP packet"? */ - } else if (strncmp("qfa", p->opt.source, 3) == 0) { + } else if (strncmp("qfa", p->opt.device, 3) == 0) { p->linktype = DLT_IP_OVER_FC; ll_hdrlen = 24; - } else if (strncmp("pl", p->opt.source, 2) == 0) { + } else if (strncmp("pl", p->opt.device, 2) == 0) { p->linktype = DLT_RAW; ll_hdrlen = 0; /* Cray UNICOS/mp pseudo link */ - } else if (strncmp("lo", p->opt.source, 2) == 0) { + } else if (strncmp("lo", p->opt.device, 2) == 0) { p->linktype = DLT_NULL; ll_hdrlen = 4; } else { @@ -330,7 +330,7 @@ pcap_activate_snoop(pcap_t *p) * the MTU first and, if that succeeds, trim the snap length * to be no greater than the MTU. */ - (void)strncpy(ifr.ifr_name, p->opt.source, sizeof(ifr.ifr_name)); + (void)strncpy(ifr.ifr_name, p->opt.device, sizeof(ifr.ifr_name)); if (ioctl(fd, SIOCGIFMTU, (char *)&ifr) < 0) { pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "SIOCGIFMTU: %s", pcap_strerror(errno)); |