fixed gcc warnings and some pointer issues thanks to hunz

[my-code/hdw-sniff.git] / hdw-sniff.c

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 96ef4a2..d3b2ca8 100644 (file)
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -5,12 +5,18 @@
  */
 
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include <pcap.h>
 
 /* IEEE 802.3 stuff -- i will concentrate on .11 stuff before! */
 #include <netinet/if_ether.h>  /* for ethhdr struct */
 #include <netinet/ip.h> /* ip */
-#include <netinet/in.h>        /* in_addr */
+#include <netinet/in.h>        /* in_addr , inet_ntoa */
 
 /* IEEE 802.11 stuff -- will become one include later ... */
 #include "ieee80211.h" /* from hunz's aeolus, short hostap_wlan.h */
@@ -24,12 +30,12 @@ int main(int argc, char *argv[]) {
        pcap_t *pcap_handle;
        char sys_call[30];
        FILE *logfile;
-       int count;
-       int *p_count;
+       struct info_struct my_info_struct;
        
        /* parse the arguments */
        if(argc<3) {
-               printf("usage: %s <interface> <monitor mode> <logfile>\n",argv[0]);
+               printf("usage: %s <interface> <monitor mode> <logfile>\n",
+                       argv[0]);
                return 0;
        }
        if(argc!=4) {
@@ -45,10 +51,13 @@ int main(int argc, char *argv[]) {
        }
                        
        /* 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);
+       if(atoi(argv[2])==1) {
+               printf("setting to monitor mode\n");
+               if(strncmp(argv[1],"wlan",4)==0)
+                       sprintf(sys_call,"iwpriv %s monitor 3",argv[1]);
+               if(strncmp(argv[1],"eth",3)==0)
+                       sprintf(sys_call,"ifconfig %s promisc",argv[1]);
+       system(sys_call);
        }
        printf("setting up interface\n");
        sprintf(sys_call,"ifconfig %s up",argv[1]);
@@ -62,36 +71,41 @@ int main(int argc, char *argv[]) {
        }
        
        /* grab a package until user breaks */
-       count=0;
-       p_count=&count;
-       pcap_dispatch(pcap_handle,-1,(pcap_handler)pcap_process,
-                       (u_char *)&p_count);
+       my_info_struct.count=0;
+       my_info_struct.mmode=argv[2][0];
+       strcpy(my_info_struct.dev,argv[1]);
+       /* do loopp */
+       pcap_loop(pcap_handle,-1,pcap_process,(u_char *)&my_info_struct);
+       return 0;
 }
 
 
 /* pcap_process callback function */
-void pcap_process(u_char *count,const struct pcap_pkthdr *pcap_header,
+void pcap_process(u_char *info,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;
+       struct info_struct *my_info_struct;
        int i;
-       int *p_count;
 
-       p_count=(int *)count;
-       ++(*p_count);
+       my_info_struct=(struct info_struct *)info;
+       ++(my_info_struct->count);
 
        printf("\n");
-       printf("---> package %d ---- %s",count,
-                       ctime((const time_t*)pcap_header->ts.tv_sec));
+       printf("---> package %d ---- %s",my_info_struct->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 :) */
-       /* ...                                  */
+       if((my_info_struct->mmode-0x30==1) && 
+               (strncmp(my_info_struct->dev,"wlan",4)==0)) {
+       printf("debug: ieee802.11\n");
+       }
 
 
        /* ieee802.3 */
@@ -122,12 +136,11 @@ void pcap_process(u_char *count,const struct pcap_pkthdr *pcap_header,
                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++)
                printf("%x ",*(package+i));
+       printf("\n");
 }