X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=hdw-sniff.c;h=08f6998ec2864146d4def150d131908bc2ec75a6;hb=9042c664acc02475b9dbb9109d1a9ddb5d9180c0;hp=32e16613c497b51ece66f8c2e7c66709cd5555f0;hpb=0ba6d6a2e1dd7a79d87a25c289f5dab4b7e8232d;p=my-code%2Fhdw-sniff.git

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 32e1661..08f6998 100644
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -128,6 +128,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	struct linux_wlan_ng_prism_hdr *prism_hdr;
 	struct ieee802_11_hdr *w_hdr;
 	struct snaphdr *snap_hdr;
+	struct beacon_struct *beacon_hdr;
 	struct ethhdr *e_hdr;
 	struct iphdr *ip_hdr;
 	struct info_struct *my_info_struct;
@@ -162,6 +163,12 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 						prism_hdr->msglen);
 	printf("device: %s |\n",prism_hdr->devname);
 	/* ieee802.11 header */
+
+	/* we need smaller w_hdr for non distributed frames */
+	if((w_hdr->frame_ctl & (1<<8)) & (w_hdr->frame_ctl & (1<<9))) {
+		printf("=> distributed packet !!!!11\n");
+	} else w_o-=(sizeof(struct snaphdr)-sizeof(unsigned short));
+
 	printf("ieee802.11 header: (%d bytes)\n",w_o);
 	w_hdr=(struct ieee802_11_hdr *)(package+p_o);
 	
@@ -186,8 +193,12 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 		strcpy(tmp_buf,"probe request");
 	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_PROBE_RESP)>0)
 		strcpy(tmp_buf,"probe response");
-	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_BEACON)>0)
-		strcpy(tmp_buf,"beacon");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_BEACON)==IEEE802_11_STYPE_BEACON) {
+		// beacon_hdr=(struct beacon_struct *)(package+p_o+w_o);
+		// printf("ssid: ");
+		// for(i=0;i<(((beacon_hdr->ssid)&0x2)>>
+		// strcpy(tmp_buf,"beacon");
+	}
 	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_ATIM)>0)
 		strcpy(tmp_buf,"announcement traffic indication message");
 	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_DISASSOC)>0)
@@ -208,12 +219,6 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 							"ok":"unknown");
 	}
 
-	/* ieee802.3 */
-	/* we need smaller w_hdr for non distributed frames */
-	if((w_hdr->frame_ctl & (1<<8)) & (w_hdr->frame_ctl & (1<<9))) {
-		printf("=> distributed packet !!!!11\n");
-	} else w_o-=(sizeof(struct snaphdr)-sizeof(unsigned short));
-
 	/* ethernet */
 	if((strncmp(my_info_struct->dev,"eth",3)==0) | 
 		((w_hdr->frame_ctl & IEEE802_11_FTYPE_DATA)>0)) {
@@ -249,20 +254,13 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 		else {
 			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);
+			printf("snap: (iv + crypted aa aa 03 00 00 00) ");
+			for(i=0;i<10;i++) {
+				printf("%x ",*(snap_hdr->snap+i));
+				crypted_snap[i]=*(snap_hdr->snap+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]);
-				crypted_snap[4+i]=snap_hdr->snap[i];
-				// if(file_fd>0) 
-				//	write(file_fd,snap_hdr->snap+i,1);
-			}
 			printf("\n");
 			crypted_snap[10]='\n';
 			if(file_fd>0) {
@@ -318,7 +316,7 @@ int hop_channel(struct info_struct *info,int foo_fd) {
 
 	struct iwreq my_iwreq;
 
-	if (info->channel>=14) info->channel=1;
+	if (info->channel>=C_MAX) info->channel=1;
 
 	memset(&my_iwreq,0,sizeof(my_iwreq));
 	strcpy(my_iwreq.ifr_name,info->dev);