iv + snap support added -> logfile

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

diff --git a/hdw-sniff.c b/hdw-sniff.c
index f17c826..32e1661 100644 (file)
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[]) {
                printf("no logfile specified, writing to stdout ...\n");
        } 
        else {
-               if((file_fd=open(argv[3],O_RDWR))!=0) {
+               if((file_fd=open(argv[3],O_RDWR | O_CREAT))!=0) {
                        printf("writing to logfile %s ...\n",argv[3]);
                }
                else {
@@ -124,7 +124,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
                        const u_char *package) {
        
        /* local variables */
-       char tmp_buf[20],crypted_snap[6];
+       char tmp_buf[20],crypted_snap[11];
        struct linux_wlan_ng_prism_hdr *prism_hdr;
        struct ieee802_11_hdr *w_hdr;
        struct snaphdr *snap_hdr;
@@ -233,12 +233,12 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
        } 
        else {
                snap_hdr=(struct snaphdr *)(package+p_o+w_o);
-               if(snap_hdr->snap[0]==0xaa &
-                  snap_hdr->snap[1]==0xaa &
-                  snap_hdr->snap[2]==0x03 &
-                  snap_hdr->snap[3]==0x00 &
-                  snap_hdr->snap[4]==0x00 &
-                  snap_hdr->snap[5]==0x00) {
+               if((snap_hdr->snap[0]==0xaa) &
+                  (snap_hdr->snap[1]==0xaa) &
+                  (snap_hdr->snap[2]==0x03) &
+                  (snap_hdr->snap[3]==0x00) &
+                  (snap_hdr->snap[4]==0x00) &
+                  (snap_hdr->snap[5]==0x00)) {
                        printf("- no encryption!\n");
                        if(snap_hdr->proto==ntohs(ETH_P_IP)) {
                                /* we want ip header to get parsed */
@@ -250,12 +250,25 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
                        printf("- crypted packet!\n");
                        /* print crypted snap - write into file */
                        printf("snap: (aa aa 03 00 00 00) ");
+                       for(i=0;i<4;i++) {
+                               printf("%x ",*(snap_hdr->snap-4+i));
+                               crypted_snap[i]=*(snap_hdr->snap-4+i);
+                               // if(file_fd>0) 
+                               //      write(file_fd,snap_hdr->snap+i-4,1);
+                       }
+                       printf("| ");
                        for(i=0;i<6;i++) {
                                printf("%x ",snap_hdr->snap[i]);
-                               if(file_fd>0) write(file_fd,snap_hdr->snap+i,1);
+                               crypted_snap[4+i]=snap_hdr->snap[i];
+                               // if(file_fd>0) 
+                               //      write(file_fd,snap_hdr->snap+i,1);
                        }
                        printf("\n");
-                       // write(file_fd,'\n',1);
+                       crypted_snap[10]='\n';
+                       if(file_fd>0) {
+                               printf("debug: saved to file\n");
+                               write(file_fd,crypted_snap,11);
+                       }
                        /* dont look at ipheader */
                        e_hdr->h_proto=htons(0);
                }