pcap_next -> pcap_loop

diff --git a/hdw-sniff.c b/hdw-sniff.c
index f6a8bc9126eea53f205da56b0339c3eab1529c41..96ef4a22eb7488e1b82b2eaba231e9804ffdfab1 100644 (file)
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -8,7 +8,7 @@
 #include <pcap.h>
 
 /* IEEE 802.3 stuff -- i will concentrate on .11 stuff before! */
-#include <netinet/if_ether.h>
+#include <netinet/if_ether.h>  /* for ethhdr struct */
 #include <netinet/ip.h> /* ip */
 #include <netinet/in.h>        /* in_addr */
 
@@ -18,28 +18,42 @@
 
 #include "hdw-sniff.h" /* my functions */
 
-#define MAX_PACKAGES 3
-
 int main(int argc, char *argv[]) {
 
-       int i,count;
        char pcap_error[PCAP_ERRBUF_SIZE];
        pcap_t *pcap_handle;
-       const u_char *package;
-       struct pcap_pkthdr pcap_header;
-       struct ethhdr *e_hdr;
-       struct ip *ip_hdr;
-       struct ieee802_11_hdr *w_hdr;
+       char sys_call[30];
+       FILE *logfile;
+       int count;
+       int *p_count;
        
        /* parse the arguments */
-       if(argc<2) {
-               printf("usage: %s <interface> <logfile>\n",argv[0]);
+       if(argc<3) {
+               printf("usage: %s <interface> <monitor mode> <logfile>\n",argv[0]);
                return 0;
        }
-       if(argc!=3) {
+       if(argc!=4) {
                printf("no logfile specified, writing to stdout ...\n");
+       } 
+       else {
+               if((logfile=fopen(argv[3],"w"))!=NULL) {
+                       printf("writing to logfile %s ...\n",argv[3]);
+               }
+               else {
+                       printf("can't open logfile!\n");
+               }
        }
-       
+                       
+       /* setting up device and set monitor mode */
+       if(atoi(argv[2])==1 && (strncmp(argv[1],"wlan",4)==0)) {
+               printf("setting to monitor mode 3\n");
+               sprintf(sys_call,"iwpriv %s monitor 3",argv[1]);
+               system(sys_call);
+       }
+       printf("setting up interface\n");
+       sprintf(sys_call,"ifconfig %s up",argv[1]);
+       system(sys_call);
+
        /* start pcap session */
        pcap_handle=pcap_open_live(argv[1],BUFSIZ,1,-1,pcap_error);
        if(pcap_handle==NULL) {
@@ -49,16 +63,32 @@ int main(int argc, char *argv[]) {
        
        /* grab a package until user breaks */
        count=0;
-       while (count<MAX_PACKAGES) {
-       count++;
+       p_count=&count;
+       pcap_dispatch(pcap_handle,-1,(pcap_handler)pcap_process,
+                       (u_char *)&p_count);
+}
+
+
+/* pcap_process callback function */
+void pcap_process(u_char *count,const struct pcap_pkthdr *pcap_header,
+                       const u_char *package) {
+       
+       /* local variables */
+       struct ethhdr *e_hdr;
+       struct ip *ip_hdr;
+       struct ieee802_11_hdr *w_hdr;
+       int i;
+       int *p_count;
+
+       p_count=(int *)count;
+       ++(*p_count);
+
        printf("\n");
-       if((package=pcap_next(pcap_handle,&pcap_header))!=NULL) {
-               printf("---> package %d ---- %s",count,
-                               ctime((const time_t*)&pcap_header.ts.tv_sec));
-               printf("pcap header: ");
-               printf("capture length=%d ",pcap_header.caplen);
-               printf("length(off wire)=%d\n",pcap_header.len);
-       }
+       printf("---> package %d ---- %s",count,
+                       ctime((const time_t*)pcap_header->ts.tv_sec));
+       printf("pcap header: ");
+       printf("capture length=%d ",pcap_header->caplen);
+       printf("length(off wire)=%d\n",pcap_header->len);
        
        /* is ieee802.11 ? -- we assume yes :) */
        /* ...                                  */
@@ -87,15 +117,17 @@ int main(int argc, char *argv[]) {
                printf("ip_addresses: source = ");
                printf("%s\tdestination = %s\n",inet_ntoa(ip_hdr->ip_src),
                                                inet_ntoa(ip_hdr->ip_dst));
+               printf("ip_id = %x ",ntohs(ip_hdr->ip_id));
+               printf("ip_offset = %x \n",ntohs(ip_hdr->ip_off));
+               printf("time2live = %x ip_proto = %x\n",ntohs(ip_hdr->ip_ttl),
+                                               ntohs(ip_hdr->ip_p));
+               printf("chksum: %x\n",ntohs(ip_hdr->ip_sum));
                
                
        }
        printf("all_hex_dump:\n");
-       for(i=sizeof(struct ethhdr);i<pcap_header.caplen;i++)
+       for(i=sizeof(struct ethhdr);i<pcap_header->caplen;i++)
                printf("%x ",*(package+i));
-       printf("\n");
-       }
-       printf("\n");
-       printf("wake up early! :)\n");
-       printf("\n");
 }
+
+               

diff --git a/hdw-sniff.h b/hdw-sniff.h
index 40a8c178f10d9e85a2873c83247c3f2fe553f408..d7a3e8961f3e9ab92bfdbc9a61a5fbaa4c0a861c 100644 (file)
--- a/hdw-sniff.h
+++ b/hdw-sniff.h
@@ -1 +1,5 @@
-/* empty */
+/* the pcap_process callback function */
+void pcap_process(u_char *count,const struct pcap_pkthdr *pcap_header,
+                       const u_char *package);
+
+