From: itojun Date: Tue, 11 Jun 2002 17:04:44 +0000 (+0000) Subject: whitespace cleanup X-Git-Tag: libpcap-0.8-bp~184 X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/5918c491c121b315104eaf1ae55f4512bb84fa1f whitespace cleanup --- diff --git a/bpf/net/bpf_filter.c b/bpf/net/bpf_filter.c index 0fa9c442..8f1ebc2e 100644 --- a/bpf/net/bpf_filter.c +++ b/bpf/net/bpf_filter.c @@ -4,7 +4,7 @@ * * This code is derived from the Stanford/CMU enet packet filter, * (net/enet.c) distributed as part of 4.3BSD, and code contributed - * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence + * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence * Berkeley Laboratory. * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.35 2000-10-23 19:32:21 fenner Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.36 2002-06-11 17:04:48 itojun Exp $ (LBL)"; #endif #include @@ -216,7 +216,7 @@ bpf_filter(pc, p, wirelen, buflen) return 0; #else abort(); -#endif +#endif case BPF_RET|BPF_K: return (u_int)pc->k; @@ -361,7 +361,7 @@ bpf_filter(pc, p, wirelen, buflen) case BPF_LD|BPF_MEM: A = mem[pc->k]; continue; - + case BPF_LDX|BPF_MEM: X = mem[pc->k]; continue; @@ -413,25 +413,25 @@ bpf_filter(pc, p, wirelen, buflen) case BPF_ALU|BPF_ADD|BPF_X: A += X; continue; - + case BPF_ALU|BPF_SUB|BPF_X: A -= X; continue; - + case BPF_ALU|BPF_MUL|BPF_X: A *= X; continue; - + case BPF_ALU|BPF_DIV|BPF_X: if (X == 0) return 0; A /= X; continue; - + case BPF_ALU|BPF_AND|BPF_X: A &= X; continue; - + case BPF_ALU|BPF_OR|BPF_X: A |= X; continue; @@ -447,23 +447,23 @@ bpf_filter(pc, p, wirelen, buflen) case BPF_ALU|BPF_ADD|BPF_K: A += pc->k; continue; - + case BPF_ALU|BPF_SUB|BPF_K: A -= pc->k; continue; - + case BPF_ALU|BPF_MUL|BPF_K: A *= pc->k; continue; - + case BPF_ALU|BPF_DIV|BPF_K: A /= pc->k; continue; - + case BPF_ALU|BPF_AND|BPF_K: A &= pc->k; continue; - + case BPF_ALU|BPF_OR|BPF_K: A |= pc->k; continue; @@ -495,9 +495,9 @@ bpf_filter(pc, p, wirelen, buflen) /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. + * code. The code must terminate with either an accept or reject. * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * 'len' bytes long). * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -512,7 +512,7 @@ bpf_validate(f, len) for (i = 0; i < len; ++i) { /* - * Check that that jumps are forward, and within + * Check that that jumps are forward, and within * the code block. */ p = &f[i]; @@ -530,7 +530,7 @@ bpf_validate(f, len) * Check that memory operations use valid addresses. */ if ((BPF_CLASS(p->code) == BPF_ST || - (BPF_CLASS(p->code) == BPF_LD && + (BPF_CLASS(p->code) == BPF_LD && (p->code & 0xe0) == BPF_MEM)) && (p->k >= BPF_MEMWORDS || p->k < 0)) return 0; diff --git a/gencode.c b/gencode.c index 853f9307..5e6cea40 100644 --- a/gencode.c +++ b/gencode.c @@ -21,7 +21,7 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.166 2002-06-11 05:30:39 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.167 2002-06-11 17:04:44 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -299,7 +299,7 @@ pcap_compile(pcap_t *p, struct bpf_program *program, } netmask = mask; - + snaplen = pcap_snapshot(p); if (snaplen == 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, @@ -1784,7 +1784,7 @@ gen_dnhostop(addr, dir, base_off) case Q_ISO: bpf_error("ISO host filtering not implemented"); - + default: abort(); } diff --git a/gencode.h b/gencode.h index a1ad10fc..cbecaab6 100644 --- a/gencode.h +++ b/gencode.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.53 2001-05-10 14:48:02 fenner Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/gencode.h,v 1.54 2002-06-11 17:04:45 itojun Exp $ (LBL) */ /* Address qualifiers. */ @@ -97,7 +97,7 @@ struct slist { struct slist *next; }; -/* +/* * A bit vector to represent definition sets. We assume TOT_REGISTERS * is smaller than 8*sizeof(atomset). */ diff --git a/inet.c b/inet.c index a90b2299..96788c9b 100644 --- a/inet.c +++ b/inet.c @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.46 2002-04-09 07:37:59 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.47 2002-06-11 17:04:45 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -121,7 +121,7 @@ dup_sockaddr(struct sockaddr *sa) { struct sockaddr *newsa; unsigned int size; - + size = SA_LEN(sa); if ((newsa = malloc(size)) == NULL) return (NULL); @@ -194,7 +194,7 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, char *name, "malloc: %s", pcap_strerror(errno)); return (-1); } - + /* * Fill in the entry. */ @@ -317,7 +317,7 @@ add_or_find_if(pcap_if_t **curdev_ret, pcap_if_t **alldevs, char *name, } else prevdev->next = curdev; } - + *curdev_ret = curdev; return (0); } @@ -379,7 +379,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, char *name, u_int flags, } } else curaddr->netmask = NULL; - + if (broadaddr != NULL) { curaddr->broadaddr = dup_sockaddr(broadaddr); if (curaddr->broadaddr == NULL) { @@ -390,7 +390,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, char *name, u_int flags, } } else curaddr->broadaddr = NULL; - + if (dstaddr != NULL) { curaddr->dstaddr = dup_sockaddr(dstaddr); if (curaddr->dstaddr == NULL) { @@ -401,7 +401,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, char *name, u_int flags, } } else curaddr->dstaddr = NULL; - + /* * Find the end of the list of addresses. */ @@ -595,7 +595,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, int fd, char *errbuf) /* * This could be the separator between a * name and an alias number, or it could be - * the separator between a name with no + * the separator between a name with no * alias number and the next field. * * If there's a colon after digits, it @@ -965,7 +965,7 @@ pcap_lookupdev(errbuf) if (pcap_findalldevs(&alldevs, errbuf) == -1) return (NULL); - + if (alldevs == NULL || (alldevs->flags & PCAP_IF_LOOPBACK)) { /* * There are no devices on the list, or the first device @@ -1003,7 +1003,7 @@ pcap_lookupnet(device, netp, maskp, errbuf) register struct sockaddr_in *sin; struct ifreq ifr; - /* + /* * The pseudo-device "any" listens on all interfaces and therefore * has the network address and -mask "0.0.0.0" therefore catching * all traffic. Using NULL for the interface is the same as "any". diff --git a/nametoaddr.c b/nametoaddr.c index d699c87f..c4b7b652 100644 --- a/nametoaddr.c +++ b/nametoaddr.c @@ -24,7 +24,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.63 2002-04-09 07:41:19 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.64 2002-06-11 17:04:45 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -340,7 +340,7 @@ pcap_ether_hostton(const char *name) return (NULL); else rewind(fp); - + while ((ep = pcap_next_etherent(fp)) != NULL) { if (strcmp(ep->name, name) == 0) { ap = (u_char *)malloc(6); diff --git a/optimize.c b/optimize.c index 2fefbef0..0e5b5d61 100644 --- a/optimize.c +++ b/optimize.c @@ -22,7 +22,7 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.73 2002-06-11 05:30:40 itojun Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.74 2002-06-11 17:04:45 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -1139,7 +1139,7 @@ opt_blk(b, do_stmts) * already there, or if this block is a return, * eliminate all the statements. */ - if (do_stmts && + if (do_stmts && ((b->out_use == 0 && aval != 0 &&b->val[A_ATOM] == aval) || BPF_CLASS(b->s.code) == BPF_RET)) { if (b->stmts != 0) { @@ -2091,12 +2091,12 @@ icode_to_fcode(root, lenp) while (1) { unMarkAll(); n = *lenp = count_stmts(root); - + fp = (struct bpf_insn *)malloc(sizeof(*fp) * n); memset((char *)fp, 0, sizeof(*fp) * n); fstart = fp; ftail = fp + n; - + unMarkAll(); if (convert_code_r(root)) break; diff --git a/pcap-dlpi.c b/pcap-dlpi.c index dc3f7598..d945ea4d 100644 --- a/pcap-dlpi.c +++ b/pcap-dlpi.c @@ -38,7 +38,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.77 2002-05-31 11:03:02 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.78 2002-06-11 17:04:46 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -1081,7 +1081,7 @@ get_release(bpf_u_int32 *majorp, bpf_u_int32 *minorp, bpf_u_int32 *microp) * says that, to see the machine's outgoing traffic, you'd need to * apply the right patches to your system, and also set that variable * with: - + echo 'lanc_outbound_promisc_flag/W1' | /usr/bin/adb -w /stand/vmunix /dev/kmem * which could be put in, for example, "/sbin/init.d/lan". @@ -1144,14 +1144,14 @@ get_dlpi_ppa(register int fd, register const char *device, register int unit, (bpf_u_int32)dlp->dl_primitive); return (-1); } - + if (ctl.len < DL_HP_PPA_ACK_SIZE) { snprintf(ebuf, PCAP_ERRBUF_SIZE, "get_dlpi_ppa: hpppa ack too small (%d < %lu)", ctl.len, (unsigned long)DL_HP_PPA_ACK_SIZE); return (-1); } - + /* allocate buffer */ if ((ppa_data_buf = (char *)malloc(dlp->dl_length)) == NULL) { snprintf(ebuf, PCAP_ERRBUF_SIZE, diff --git a/pcap-enet.c b/pcap-enet.c index 821a0d9e..2e478c45 100644 --- a/pcap-enet.c +++ b/pcap-enet.c @@ -8,7 +8,7 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/pcap-enet.c,v 1.5 2000-10-12 03:53:59 guy Exp $"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-enet.c,v 1.6 2002-06-11 17:04:46 itojun Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -133,7 +133,7 @@ wrapup(int fd) perror("tcpdump: enet ioctl EIOSTATS error"); exit(-1); } - + fprintf(stderr, "%d packets queued", es.enStat_Rcnt); if (es.enStat_Rdrops > 0) fprintf(stderr, ", %d dropped", es.enStat_Rdrops); @@ -141,7 +141,7 @@ wrapup(int fd) fprintf(stderr, ", %d tcpdump %s", es.enStat_Reads, es.enStat_Reads > 1 ? "reads" : "read"); if (es.enStat_MaxRead > 1) - fprintf(stderr, ", %d packets in largest read", + fprintf(stderr, ", %d packets in largest read", es.enStat_MaxRead); putc('\n', stderr); #endif /* IBMRTPC */ diff --git a/pcap-int.h b/pcap-int.h index 5f7c6d49..6e5b9c8a 100644 --- a/pcap-int.h +++ b/pcap-int.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.33 2001-08-24 07:46:52 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.34 2002-06-11 17:04:46 itojun Exp $ (LBL) */ #ifndef pcap_int_h @@ -97,7 +97,7 @@ struct pcap { */ u_char *pkt; - + /* * Placeholder for filter code if bpf not in kernel. */ diff --git a/pcap-linux.c b/pcap-linux.c index 3af82fb2..a961415c 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -3,13 +3,13 @@ * * Copyright (c) 2000 Torsten Landschoff * Sebastian Krahmer - * + * * License: BSD - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -19,14 +19,14 @@ * 3. The names of the authors may not be used to endorse or promote * products derived from this software without specific prior * written permission. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.80 2002-06-01 09:36:26 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.81 2002-06-11 17:04:47 itojun Exp $ (LBL)"; #endif /* @@ -117,7 +117,7 @@ static const char rcsid[] = * isn't defined? It only defines one data structure in 2.0.x, so * it shouldn't cause any problems. */ -#ifdef PF_PACKET +#ifdef PF_PACKET # include /* @@ -158,8 +158,8 @@ typedef int socklen_t; #define MAX_LINKHEADER_SIZE 256 -/* - * When capturing on all interfaces we use this as the buffer size. +/* + * When capturing on all interfaces we use this as the buffer size. * Should be bigger then all MTUs that occur in real life. * 64kB should be enough for now. */ @@ -199,13 +199,13 @@ static struct sock_fprog total_fcode #endif /* - * Get a handle for a live capture from the given device. You can - * pass NULL as device to get all packages (without link level + * Get a handle for a live capture from the given device. You can + * pass NULL as device to get all packages (without link level * information of course). If you pass 1 as promisc the interface - * will be set to promiscous mode (XXX: I think this usage should + * will be set to promiscous mode (XXX: I think this usage should * be deprecated and functions be added to select that later allow * modification of that values -- Torsten). - * + * * See also pcap(3). */ pcap_t * @@ -233,7 +233,7 @@ pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf) handle->md.timeout = to_ms; /* - * NULL and "any" are special devices which give us the hint to + * NULL and "any" are special devices which give us the hint to * monitor all devices. */ if (!device || strcmp(device, "any") == 0) { @@ -245,7 +245,7 @@ pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf) snprintf(ebuf, PCAP_ERRBUF_SIZE, "Promiscuous mode not supported on the \"any\" device"); } - + } else handle->md.device = strdup(device); @@ -256,13 +256,13 @@ pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf) return NULL; } - /* - * Current Linux kernels use the protocol family PF_PACKET to - * allow direct access to all packets on the network while - * older kernels had a special socket type SOCK_PACKET to + /* + * Current Linux kernels use the protocol family PF_PACKET to + * allow direct access to all packets on the network while + * older kernels had a special socket type SOCK_PACKET to * implement this feature. * While this old implementation is kind of obsolete we need - * to be compatible with older kernels for a while so we are + * to be compatible with older kernels for a while so we are * trying both methods with the newer method preferred. */ @@ -274,10 +274,10 @@ pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf) live_open_ok = 1; } if (!live_open_ok) { - /* + /* * Both methods to open the packet socket failed. Tidy * up and report our failure (ebuf is expected to be - * set by the functions above). + * set by the functions above). */ if (handle->md.device != NULL) @@ -387,7 +387,7 @@ pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf) /* * Read at most max_packets from the capture stream and call the callback * for each of them. Returns the number of packets handled or -1 if an - * error occured. + * error occured. */ int pcap_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user) @@ -400,7 +400,7 @@ pcap_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user) } /* - * Read a packet from the socket calling the handler provided by + * Read a packet from the socket calling the handler provided by * the user. Returns the number of packets received or -1 if an * error occured. */ @@ -441,9 +441,9 @@ pcap_read_packet(pcap_t *handle, pcap_handler callback, u_char *userdata) bp = handle->buffer + handle->offset; do { fromlen = sizeof(from); - packet_len = recvfrom( + packet_len = recvfrom( handle->fd, bp + offset, - handle->bufsize - offset, MSG_TRUNC, + handle->bufsize - offset, MSG_TRUNC, (struct sockaddr *) &from, &fromlen); } while (packet_len == -1 && errno == EINTR); @@ -534,16 +534,16 @@ pcap_read_packet(pcap_t *handle, pcap_handler callback, u_char *userdata) #endif /* - * XXX: According to the kernel source we should get the real - * packet len if calling recvfrom with MSG_TRUNC set. It does + * XXX: According to the kernel source we should get the real + * packet len if calling recvfrom with MSG_TRUNC set. It does * not seem to work here :(, but it is supported by this code - * anyway. + * anyway. * To be honest the code RELIES on that feature so this is really * broken with 2.2.x kernels. * I spend a day to figure out what's going on and I found out - * that the following is happening: + * that the following is happening: * - * The packet comes from a random interface and the packet_rcv + * The packet comes from a random interface and the packet_rcv * hook is called with a clone of the packet. That code inserts * the packet into the receive queue of the packet socket. * If a filter is attached to that socket that filter is run @@ -553,10 +553,10 @@ pcap_read_packet(pcap_t *handle, pcap_handler callback, u_char *userdata) * # tcpdump -d * (000) ret #68 * - * So the packet filter cuts down the packet. The recvfrom call + * So the packet filter cuts down the packet. The recvfrom call * says "hey, it's only 68 bytes, it fits into the buffer" with - * the result that we don't get the real packet length. This - * is valid at least until kernel 2.2.17pre6. + * the result that we don't get the real packet length. This + * is valid at least until kernel 2.2.17pre6. * * We currently handle this by making a copy of the filter * program, fixing all "ret" instructions with non-zero @@ -727,7 +727,7 @@ pcap_stats(pcap_t *handle, struct pcap_stat *stats) } /* - * Attach the given BPF code to the packet capture device. + * Attach the given BPF code to the packet capture device. */ int pcap_setfilter(pcap_t *handle, struct bpf_program *filter) @@ -752,9 +752,9 @@ pcap_setfilter(pcap_t *handle, struct bpf_program *filter) /* install_bpf_program() filled in errbuf */ return -1; - /* - * Run user level packet filter by default. Will be overriden if - * installing a kernel filter succeeds. + /* + * Run user level packet filter by default. Will be overriden if + * installing a kernel filter succeeds. */ handle->md.use_bpf = 0; @@ -771,7 +771,7 @@ pcap_setfilter(pcap_t *handle, struct bpf_program *filter) #ifdef USHRT_MAX if (handle->fcode.bf_len > USHRT_MAX) { /* - * fcode.len is an unsigned short for current kernel. + * fcode.len is an unsigned short for current kernel. * I have yet to see BPF-Code with that much * instructions but still it is possible. So for the * sake of correctness I added this check. @@ -831,14 +831,14 @@ pcap_setfilter(pcap_t *handle, struct bpf_program *filter) } else if (err == -1) /* Non-fatal error */ { - /* + /* * Print a warning if we weren't able to install * the filter for a reason other than "this kernel * isn't configured to support socket filters. */ if (errno != ENOPROTOOPT && errno != EOPNOTSUPP) { fprintf(stderr, - "Warning: Kernel filter failed: %s\n", + "Warning: Kernel filter failed: %s\n", pcap_strerror(errno)); } } @@ -870,8 +870,8 @@ pcap_setfilter(pcap_t *handle, struct bpf_program *filter) } /* - * Linux uses the ARP hardware type to identify the type of an - * interface. pcap uses the DLT_xxx constants for this. This + * Linux uses the ARP hardware type to identify the type of an + * interface. pcap uses the DLT_xxx constants for this. This * function takes a pointer to a "pcap_t", and an ARPHRD_xxx * constant, as arguments, and sets "handle->linktype" to the * appropriate DLT_XXX constant and sets "handle->offset" to @@ -884,7 +884,7 @@ pcap_setfilter(pcap_t *handle, struct bpf_program *filter) * If "cooked_ok" is non-zero, we can use DLT_LINUX_SLL and capture * in cooked mode; otherwise, we can't use cooked mode, so we have * to pick some type that works in raw mode, or fail. - * + * * Sets the link type to -1 if unable to map the type. */ static void map_arphrd_to_dlt(pcap_t *handle, int arptype, int cooked_ok) @@ -1086,7 +1086,7 @@ static void map_arphrd_to_dlt(pcap_t *handle, int arptype, int cooked_ok) * FIXME: 0 uses to mean success (Sebastian) */ static int -live_open_new(pcap_t *handle, char *device, int promisc, +live_open_new(pcap_t *handle, char *device, int promisc, int to_ms, char *ebuf) { #ifdef HAVE_PF_PACKET_SOCKETS @@ -1100,10 +1100,10 @@ live_open_new(pcap_t *handle, char *device, int promisc, do { /* * Open a socket with protocol family packet. If a device is - * given we try to open it in raw mode otherwise we use - * the cooked interface. + * given we try to open it in raw mode otherwise we use + * the cooked interface. */ - sock_fd = device ? + sock_fd = device ? socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)) : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)); @@ -1136,8 +1136,8 @@ live_open_new(pcap_t *handle, char *device, int promisc, handle->offset = 0; /* - * What kind of frames do we have to deal with? Fall back - * to cooked mode if we have an unknown interface type. + * What kind of frames do we have to deal with? Fall back + * to cooked mode if we have an unknown interface type. */ if (device) { @@ -1169,7 +1169,7 @@ live_open_new(pcap_t *handle, char *device, int promisc, "close: %s", pcap_strerror(errno)); break; } - sock_fd = socket(PF_PACKET, SOCK_DGRAM, + sock_fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)); if (sock_fd == -1) { snprintf(ebuf, PCAP_ERRBUF_SIZE, @@ -1225,7 +1225,7 @@ live_open_new(pcap_t *handle, char *device, int promisc, /* Select promiscuous mode on/off */ #ifdef SOL_PACKET - /* + /* * Hmm, how can we set promiscuous mode on all interfaces? * I am not sure if that is possible at all. */ @@ -1233,12 +1233,12 @@ live_open_new(pcap_t *handle, char *device, int promisc, if (device) { memset(&mr, 0, sizeof(mr)); mr.mr_ifindex = device_id; - mr.mr_type = promisc ? + mr.mr_type = promisc ? PACKET_MR_PROMISC : PACKET_MR_ALLMULTI; - if (setsockopt(sock_fd, SOL_PACKET, + if (setsockopt(sock_fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mr, sizeof(mr)) == -1) { - snprintf(ebuf, PCAP_ERRBUF_SIZE, + snprintf(ebuf, PCAP_ERRBUF_SIZE, "setsockopt: %s", pcap_strerror(errno)); break; } @@ -1261,8 +1261,8 @@ live_open_new(pcap_t *handle, char *device, int promisc, else return 0; #else - strncpy(ebuf, - "New packet capturing interface not supported by build " + strncpy(ebuf, + "New packet capturing interface not supported by build " "environment", PCAP_ERRBUF_SIZE); return 0; #endif @@ -1270,7 +1270,7 @@ live_open_new(pcap_t *handle, char *device, int promisc, #ifdef HAVE_PF_PACKET_SOCKETS /* - * Return the index of the given device name. Fill ebuf and return + * Return the index of the given device name. Fill ebuf and return * -1 on failure. */ static int @@ -1291,7 +1291,7 @@ iface_get_id(int fd, const char *device, char *ebuf) } /* - * Bind the socket associated with FD to the given device. + * Bind the socket associated with FD to the given device. */ static int iface_bind(int fd, int ifindex, char *ebuf) @@ -1319,9 +1319,9 @@ iface_bind(int fd, int ifindex, char *ebuf) return -2; } - if (err > 0) { + if (err > 0) { snprintf(ebuf, PCAP_ERRBUF_SIZE, - "bind: %s", pcap_strerror(err)); + "bind: %s", pcap_strerror(err)); return -2; } @@ -1336,7 +1336,7 @@ iface_bind(int fd, int ifindex, char *ebuf) /* * With older kernels promiscuous mode is kind of interesting because we * have to reset the interface before exiting. The problem can't really - * be solved without some daemon taking care of managing usage counts. + * be solved without some daemon taking care of managing usage counts. * If we put the interface into promiscuous mode, we set a flag indicating * that we must take it out of that mode when the interface is closed, * and, when closing the interface, if that flag is set we take it out @@ -1383,7 +1383,7 @@ void pcap_close_linux( pcap_t *handle ) memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, handle->md.device, sizeof(ifr.ifr_name)); if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) == -1) { - fprintf(stderr, + fprintf(stderr, "Can't restore interface flags (SIOCGIFFLAGS failed: %s).\n" "Please adjust manually.\n" "Hint: This can't happen with Linux >= 2.2.0.\n", @@ -1396,7 +1396,7 @@ void pcap_close_linux( pcap_t *handle ) */ ifr.ifr_flags &= ~IFF_PROMISC; if (ioctl(handle->fd, SIOCSIFFLAGS, &ifr) == -1) { - fprintf(stderr, + fprintf(stderr, "Can't restore interface flags (SIOCSIFFLAGS failed: %s).\n" "Please adjust manually.\n" "Hint: This can't happen with Linux >= 2.2.0.\n", @@ -1442,7 +1442,7 @@ void pcap_close_linux( pcap_t *handle ) * FIXME: 0 uses to mean success (Sebastian) */ static int -live_open_old(pcap_t *handle, char *device, int promisc, +live_open_old(pcap_t *handle, char *device, int promisc, int to_ms, char *ebuf) { int sock_fd = -1, arptype; @@ -1570,7 +1570,7 @@ live_open_old(pcap_t *handle, char *device, int promisc, } /* - * Bind the socket associated with FD to the given device using the + * Bind the socket associated with FD to the given device using the * interface of the old kernels. */ static int @@ -1596,9 +1596,9 @@ iface_bind_old(int fd, const char *device, char *ebuf) return -1; } - if (err > 0) { + if (err > 0) { snprintf(ebuf, PCAP_ERRBUF_SIZE, - "bind: %s", pcap_strerror(err)); + "bind: %s", pcap_strerror(err)); return -1; } @@ -1609,7 +1609,7 @@ iface_bind_old(int fd, const char *device, char *ebuf) /* ===== System calls available on all supported kernels ============== */ /* - * Query the kernel for the MTU of the given interface. + * Query the kernel for the MTU of the given interface. */ static int iface_get_mtu(int fd, const char *device, char *ebuf) @@ -1815,7 +1815,7 @@ set_kernel_filter(pcap_t *handle, struct sock_fprog *fcode) * the filtering done in userland even if it could have been * done in the kernel. */ - if (setsockopt(handle->fd, SOL_SOCKET, SO_ATTACH_FILTER, + if (setsockopt(handle->fd, SOL_SOCKET, SO_ATTACH_FILTER, &total_fcode, sizeof(total_fcode)) == 0) { char drain[1]; @@ -1851,7 +1851,7 @@ set_kernel_filter(pcap_t *handle, struct sock_fprog *fcode) /* * Now attach the new filter. */ - ret = setsockopt(handle->fd, SOL_SOCKET, SO_ATTACH_FILTER, + ret = setsockopt(handle->fd, SOL_SOCKET, SO_ATTACH_FILTER, fcode, sizeof(*fcode)); if (ret == -1 && total_filter_on) { /* @@ -1875,7 +1875,7 @@ set_kernel_filter(pcap_t *handle, struct sock_fprog *fcode) errno = save_errno; } - return ret; + return ret; } static int diff --git a/pcap-pf.c b/pcap-pf.c index 01e791c3..91f3e109 100644 --- a/pcap-pf.c +++ b/pcap-pf.c @@ -24,7 +24,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.65 2001-12-10 07:14:19 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.66 2002-06-11 17:04:47 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -386,8 +386,8 @@ your system may not be properly configured; see \"man packetfilter(4)\"\n", return (p); bad: - if (p->fd >= 0) - close(p->fd); + if (p->fd >= 0) + close(p->fd); free(p); return (NULL); } diff --git a/pcap.c b/pcap.c index 69e58568..6282cb88 100644 --- a/pcap.c +++ b/pcap.c @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.38 2001-12-29 21:55:32 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.39 2002-06-11 17:04:47 itojun Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -281,7 +281,7 @@ pcap_close(pcap_t *p) free(p->sf.base); } else if (p->buffer != NULL) free(p->buffer); - + pcap_freecode(&p->fcode); free(p); } diff --git a/sll.h b/sll.h index 431ebf4a..22375373 100644 --- a/sll.h +++ b/sll.h @@ -4,7 +4,7 @@ * * This code is derived from the Stanford/CMU enet packet filter, * (net/enet.c) distributed as part of 4.3BSD, and code contributed - * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence + * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence * Berkeley Laboratory. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/libpcap/Attic/sll.h,v 1.6 2000-12-23 07:50:19 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/Attic/sll.h,v 1.7 2002-06-11 17:04:48 itojun Exp $ (LBL) */ /*