diff options
author | Guy Harris <guy@alum.mit.edu> | 2017-01-20 19:55:38 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2017-01-20 19:55:38 -0800 |
commit | b7586455b7be0ee1746d3fc9f4b4f8b7ee911d00 (patch) | |
tree | d916fdffbc9c6de08df4b61bce98db39c7f37eed | |
parent | f8198434d6d0b1016ee597a7c64723b1b1c48333 (diff) |
Rename a routine to match find_or_add_if().
Rename add_addr_to_iflist() to add_addr_to_if().
-rw-r--r-- | fad-getad.c | 2 | ||||
-rw-r--r-- | fad-gifc.c | 2 | ||||
-rw-r--r-- | fad-glifc.c | 2 | ||||
-rw-r--r-- | pcap-int.h | 2 | ||||
-rw-r--r-- | pcap.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/fad-getad.c b/fad-getad.c index 0e52b0be..6a012196 100644 --- a/fad-getad.c +++ b/fad-getad.c @@ -264,7 +264,7 @@ pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf, /* * Add information for this address to the list. */ - if (add_addr_to_iflist(devlistp, ifa->ifa_name, ifa->ifa_flags, + if (add_addr_to_if(devlistp, ifa->ifa_name, ifa->ifa_flags, addr, addr_size, netmask, addr_size, broadaddr, broadaddr_size, dstaddr, dstaddr_size, errbuf) < 0) { @@ -400,7 +400,7 @@ pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf, /* * Add information for this address to the list. */ - if (add_addr_to_iflist(devlistp, ifrp->ifr_name, + if (add_addr_to_if(devlistp, ifrp->ifr_name, ifrflags.ifr_flags, &ifrp->ifr_addr, SA_LEN(&ifrp->ifr_addr), netmask, netmask_size, broadaddr, broadaddr_size, diff --git a/fad-glifc.c b/fad-glifc.c index cc895c28..b0cb2a85 100644 --- a/fad-glifc.c +++ b/fad-glifc.c @@ -328,7 +328,7 @@ pcap_findalldevs_interfaces(pcap_if_list_t *devlistp, char *errbuf, /* * Add information for this address to the list. */ - if (add_addr_to_iflist(devlistp, ifrp->lifr_name, + if (add_addr_to_if(devlistp, ifrp->lifr_name, ifrflags.lifr_flags, (struct sockaddr *)&ifrp->lifr_addr, sizeof (struct sockaddr_storage), @@ -437,7 +437,7 @@ int add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t, #ifndef _WIN32 pcap_if_t *find_or_add_if(pcap_if_list_t *, const char *, bpf_u_int32, char *); -int add_addr_to_iflist(pcap_if_list_t *, const char *, bpf_u_int32, +int add_addr_to_if(pcap_if_list_t *, const char *, bpf_u_int32, struct sockaddr *, size_t, struct sockaddr *, size_t, struct sockaddr *, size_t, struct sockaddr *, size_t, char *); #endif @@ -715,7 +715,7 @@ find_or_add_if(pcap_if_list_t *devlistp, const char *name, * add interfaces even if they have no addresses.) */ int -add_addr_to_iflist(pcap_if_list_t *devlistp, const char *name, +add_addr_to_if(pcap_if_list_t *devlistp, const char *name, bpf_u_int32 if_flags, struct sockaddr *addr, size_t addr_size, struct sockaddr *netmask, size_t netmask_size, |