thrd try :)

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 174e00f7d20b7e46092051154a5674fb98f80245..8f11c82f946f8815f46be13b3d031d094e882916 100644 (file)
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -16,9 +16,11 @@
 
 #include "hdw-sniff.h" /* my functions */
 
+#define MAX_PACKAGES 3
+
 int main(int argc, char *argv[]) {
 
-       int i;
+       int i,count;
        char pcap_error[PCAP_ERRBUF_SIZE];
        pcap_t *pcap_handle;
        const u_char *package;
@@ -43,52 +45,42 @@ int main(int argc, char *argv[]) {
        }
        
        /* grab a package until user breaks */
-       while (1) {
+       count=0;
+       while (count<MAX_PACKAGES) {
+       count++;
        printf("\n");
-
-       printf("----| new package |----| hdw - sniff |----\n");
        if((package=pcap_next(pcap_handle,&pcap_header))!=NULL) {
-               printf("package received at: %s",
-                       ctime((const time_t*)&pcap_header.ts.tv_sec));
+               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);
        }
        
-       /* 802.11 or 802.3 -- not quite sure about 'D' & '\0' */
-       if(*package=='D') {
-               printf("ieee802.11: ");
-       }
-       else if(*package=='\0') {
-               printf("ethernet: ");
-               /* reading ethernet header */
-               e_hdr=(struct ethhdr *)package;
-               /* what types ? */
-               printf("types = ");
-               // for(i=0;i<2;i++)
-               printf("%x %x\n",
-                       /* i==0?"0x":" ", */
-                       *(e_hdr->h_proto)
-                       /* i==1?"\n":"" */
-               );
-               printf("dest_addr = ");
-               for(i=0;i<ETH_ALEN;i++)
-               printf("%x%s",*(e_hdr->h_dest+i),((i==ETH_ALEN-1)?" ":":"));
-               printf(" src_addr = ");
-               for(i=0;i<ETH_ALEN;i++)
-               printf("%x%s",*(e_hdr->h_source+i),((i==ETH_ALEN-1)?"\n":":"));
-               printf("rest:\n");
-               for(i=sizeof(struct ethhdr);i<pcap_header.caplen;i++)
-                       printf("%x ",*(package+i));
-               printf("\n");
-       }
-       else {
-               printf("unknown: ");
-               /* print the whole package in hex */
-               for(i=0;i<=pcap_header.caplen;i++) printf("%x ",*(package+i));
-               printf("\n");
-               printf("%c <- identifier for unknown!\n",*package);
+       /* is ieee802.11 ? -- we assume yes :) */
+       
+       
+       /* ethernet */
+       e_hdr=(struct ethhdr *)package;
+       /* what types ? */
+       printf("types = ");
+       printf("%x  ",ntohs(e_hdr->h_proto));
+       printf("dest_addr = ");
+       for(i=0;i<ETH_ALEN;i++)
+       printf("%x%s",*(e_hdr->h_dest+i),((i==ETH_ALEN-1)?" ":":"));
+       printf(" src_addr = ");
+       for(i=0;i<ETH_ALEN;i++)
+       printf("%x%s",*(e_hdr->h_source+i),((i==ETH_ALEN-1)?"\n":":"));
+       if(ntohs(e_hdr->h_proto)==ETH_P_IP) {
+               printf("ip protocol: ");
+               // printf("
        }
+       printf("rest:\n");
+       for(i=sizeof(struct ethhdr);i<pcap_header.caplen;i++)
+               printf("%x ",*(package+i));
+       printf("\n");
        }
-       printf("just beacon frames, ha? - wake up early! :)");
+       printf("\n");
+       printf("just beacon frames, ha? - wake up early! :)\n");
+       printf("\n");
 }