--- libaitio/example/bpf.c 2013/06/25 17:06:02 1.1.2.6 +++ libaitio/example/bpf.c 2013/12/15 22:57:20 1.4 @@ -61,7 +61,6 @@ static void * ShowPkt(void *buffer) { char Proto = 0, szStr[BUFSIZ], szLine[BUFSIZ], szWrk[BUFSIZ], szShow[USHRT_MAX] = { 0 }; - struct bpf_hdr *bpf = buffer; #ifdef __FreeBSD__ struct bpf_zbuf_header *bzh = buffer; struct icmphdr *icmp; @@ -78,15 +77,7 @@ ShowPkt(void *buffer) assert(buffer); -#ifdef __FreeBSD__ - snprintf(szLine, BUFSIZ, "#Packet length: %d\n>>> Ethernet ...\n", flg ? bzh->bzh_kernel_len : bpf->bh_datalen); - strlcat(szShow, szLine, USHRT_MAX); - eth = (struct ether_header *) (buffer + (flg ? bzh->bzh_kernel_len : bpf->bh_hdrlen)); -#else - snprintf(szLine, BUFSIZ, "#Packet length: %d\n>>> Ethernet ...\n", bpf->bh_datalen); - strlcat(szShow, szLine, USHRT_MAX); - eth = (struct ether_header *) (buffer + bpf->bh_hdrlen); -#endif + eth = (struct ether_header *) buffer; switch (ntohs(eth->ether_type)) { case ETHERTYPE_ARP: @@ -246,7 +237,7 @@ ShowPkt(void *buffer) } printf("%s===\n", szShow); - pthread_exit(NULL); + return NULL; } // ---------------------- @@ -257,13 +248,14 @@ main(int argc, char **argv) u_int n, count = (u_int) -1; register int i; int dev, fd, ret, siz = 0; - char szStr[BUFSIZ], szMap[MAXPATHLEN] = { 0 }, *buffer = NULL; + char szStr[BUFSIZ], szEA[STRSIZ], szMap[MAXPATHLEN] = { 0 }, *buffer = NULL; struct ifreq ifr; struct pollfd pfd = { 0 }; pthread_t tid; char ch, mode = 'R'; struct timespec ts_start, ts_end; void *bz = NULL; + ether_addr_t ea; while ((ch = getopt(argc, argv, "hvwzs:p:f:")) != -1) switch (ch) { @@ -299,12 +291,16 @@ main(int argc, char **argv) else strlcpy(szStr, *argv, sizeof szStr); + printf("io_getmaciface(%s) -> %d\n", szStr, io_getmaciface(szStr, &ea)); + e_ether_ntoa(&ea, szEA, sizeof szEA); + printf("ethernet address is %s\n", szEA); + #ifdef __FreeBSD__ - dev = io_etherOpen(szStr, O_RDWR, 42, (u_int*) &siz, &bz); + dev = io_etherOpen(szStr, O_RDWR | O_NONBLOCK, 42, 0, (u_int*) &siz, (flg) ? &bz : NULL); if (dev == -1) - dev = io_etherOpen(szStr, O_RDWR, 42, (u_int*) &siz, NULL); + dev = io_etherOpen(szStr, O_RDWR | O_NONBLOCK, 42, 0, (u_int*) &siz, NULL); #else - dev = io_etherOpen(szStr, O_RDWR, 42, (u_int*) &siz, NULL); + dev = io_etherOpen(szStr, O_RDWR, 42, 0, (u_int*) &siz, NULL); #endif if (dev == -1) { printf("Error:: #%d - %s\n", io_GetErrno(), io_GetError()); @@ -341,17 +337,18 @@ main(int argc, char **argv) if (mode == 'R') { pfd.events = POLLIN; for (i = 0; i < count; i++) { - if (poll(&pfd, 1, -1) == -1) + if ((ret = poll(&pfd, 1, -1)) == -1) break; ret = io_etherRecv(dev, buffer, siz, bz); + if (!ret) + continue; if (ret == -1) printf("%d) io_etherRecv(%d) #%d - %s\n", i, ret, io_GetErrno(), io_GetError()); if (Verbose) { printf("%d) +readed %d bytes\n", i, ret); - pthread_create(&tid, NULL, ShowPkt, buffer); - pthread_join(tid, NULL); + ShowPkt(buffer); } } } else {