Macintosh-SW
/
lwip-contrib-mac
mirror of https://github.com/ep00ch/lwip-contrib-mac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pcapif: remove trailing spaces from adapter names, deleted old (unused) files

This commit is contained in:
Simon Goldschmidt 2011-10-21 20:03:37 +02:00
parent a412496558
commit cac420aec5
3 changed files with 9 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ports/win32/pcap_helper.c
View File

@ -1,70 +0,0 @@
#include "pcap_helper.h"
#define WIN32_LEAN_AND_MEAN
/* get the windows definitions of the following 4 functions out of the way */
#include <stdlib.h>
#include <stdio.h>
#define HAVE_REMOTE
#include "pcap.h"
/** Get the index of an adapter by its network address
*
* @param netaddr network address of the adapter (e.g. 192.168.1.0)
* @return index of the adapter or negative on error
*/
int
get_adapter_index_from_addr(struct in_addr *netaddr, char *guid, size_t guid_len)
{
pcap_if_t *alldevs;
pcap_if_t *d;
char errbuf[PCAP_ERRBUF_SIZE+1];
char source[] = "rpcap://";
int index = 0;
memset(guid, 0, guid_len);
memset(errbuf, 0, sizeof(errbuf));
/* Retrieve the interfaces list */
if (pcap_findalldevs_ex(source, NULL, &alldevs, errbuf) == -1) {
printf("Error in pcap_findalldevs: %s\n", errbuf);
return -1;
}
/* Scan the list printing every entry */
for (d = alldevs; d != NULL; d = d->next, index++) {
pcap_addr_t *a;
for(a = d->addresses; a != NULL; a = a->next) {
if (a->addr->sa_family == AF_INET) {
ULONG a_addr = ((struct sockaddr_in *)a->addr)->sin_addr.s_addr;
ULONG a_netmask = ((struct sockaddr_in *)a->netmask)->sin_addr.s_addr;
ULONG a_netaddr = a_addr & a_netmask;
ULONG addr = (*netaddr).s_addr;
if (a_netaddr == addr) {
int ret = -1;
char name[128];
char *start, *end;
size_t len = strlen(d->name);
if(len > 127) {
len = 127;
}
memcpy(name, d->name, len);
name[len] = 0;
start = strstr(name, "{");
if (start != NULL) {
end = strstr(start, "}");
if (end != NULL) {
size_t len = end - start + 1;
memcpy(guid, start, len);
ret = index;
}
}
pcap_freealldevs(alldevs);
return ret;
}
}
}
}
printf("Network address not found.\n");
pcap_freealldevs(alldevs);
return -1;
}

11
ports/win32/pcap_helper.h
View File

@ -1,11 +0,0 @@
#ifndef __PCAP_HELPER_H__
#define __PCAP_HELPER_H__
#include <stdlib.h>
struct in_addr;
int get_adapter_index_from_addr(struct in_addr* netaddr, char *guid, size_t guid_len);
#endif /* __PCAP_HELPER_H__ */

10
ports/win32/pcapif.c
View File

@ -293,6 +293,10 @@ pcapif_init_adapter(int adapter_num, void *arg)
desc += 17;
}
len = LWIP_MIN(len, ADAPTER_DESC_LEN-1);
while ((desc[len-1] == ' ') || (desc[len-1] == '\t')) {
/* don't copy trailing whitespace */
len--;
}
strncpy(pa->description, desc, len);
pa->description[len] = 0;
} else {
@ -307,7 +311,7 @@ pcapif_init_adapter(int adapter_num, void *arg)
char *desc = d->description;
char descBuf[128];
size_t len;
const char* devname = d->name;;
const char* devname = d->name;
if (d->name == NULL) {
devname = "<unnamed>";
} else {
@ -331,6 +335,10 @@ pcapif_init_adapter(int adapter_num, void *arg)
desc += 17;
}
len = LWIP_MIN(len, 127);
while ((desc[len-1] == ' ') || (desc[len-1] == '\t')) {
/* don't copy trailing whitespace */
len--;
}
strncpy(descBuf, desc, len);
descBuf[len] = 0;
printf(" Desc: \"%s\"\n", descBuf);