X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=hdw-sniff.c;h=bd7c54d7f2ea9c942f54a8869078867d53771997;hb=f3c2f4ca0b3e1477ee21ccd6b023a82512386702;hp=1773b99dd07da42e6f84e5d4feca3c5e2cab3084;hpb=e53bfefedc266907cc35723e5c5156c6d5baa71d;p=my-code%2Fhdw-sniff.git

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 1773b99..bd7c54d 100644
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -60,7 +60,7 @@ int main(int argc, char *argv[]) {
 	if(atoi(argv[2])==1) {
 		printf("setting to monitor mode\n");
 		if(strncmp(argv[1],"wlan",4)==0)
-			sprintf(sys_call,"iwpriv %s monitor 2",argv[1]);
+			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);
@@ -142,7 +142,8 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	printf("pcap header:\n");
 	printf("capture_length: %d (dec.)\t",pcap_header->caplen);
 	printf("length(off wire): %d (dec.)\n",pcap_header->len);
-	
+
+	/* wireless stuff */
 	/* prism wlan ng headers */
 	if((my_info_struct->mmode-0x30==1) && 
 		(strncmp(my_info_struct->dev,"wlan",4)==0)) {
@@ -151,26 +152,20 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	printf("message code/length: %d/%d\n",ntohs(prism_hdr->msgcode),
 						ntohs(prism_hdr->msglen));
 	printf("device: %s\n",prism_hdr->devname);
-	/* skip wlan_ng_prism header */
-	// package=package+p_o;
-
 	/* ieee802.11 header */
 	printf("ieee802.11 header: (%d bytes)\n",w_o);
 	w_hdr=(struct ieee802_11_hdr *)(package+p_o);
 	
-	printf("debug:\n");
-	for(i=0;i<16;i++) {
-		printf("%x -> ",1<<i);
-		printf("%x\n",(ntohs(w_hdr->frame_ctl) & (1<<i)));
-	}
-	printf("frame_control: %x duration_id: %x\n",ntohs(w_hdr->frame_ctl),
-						ntohs(w_hdr->duration_id));
+	printf("fc: ");
+	for(i=0;i<16;i++)
+		printf("%s%d%s",(i==0?"|":""),
+				((ntohs(w_hdr->frame_ctl) & (1<<i))>0?1:0),
+				(i==15?"|\n":"|"));
+	
+	printf("ion_id: %x\n",ntohs(w_hdr->duration_id));
 	printf("version check ... %s\n",
 	((ntohs(w_hdr->frame_ctl) & IEEE802_11_FCTL_VERS)==0x00)?
 							"ok":"unknown");
-	// printf("type: 
-	/* skip ieee802.11 header */
-	// package=package+w_o;
 	}
 
 	/* ieee802.3 */
@@ -207,21 +202,18 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 			ip_hdr->daddr&0xff<<i,
 			(i==0?"\n":"."));
 		}
-		// printf("ip_addresses: source = ");
-		// printf("%s\tdestination = %s\n",inet_ntoa(ip_hdr->saddr),
-		//				inet_ntoa(ip_hdr->daddr));
 		printf("ip_id = %x ",ntohs(ip_hdr->id));
 		printf("ip_offset = %x \n",ntohs(ip_hdr->frag_off));
 		printf("time2live = %x ip_proto = %x\n",ntohs(ip_hdr->ttl),
 						ntohs(ip_hdr->protocol));
 		// printf("chksum: %x\n",ntohs(ip_hdr->ip_sum));
 	}
-	printf("all ethernet dump: (hex)\n");
-	for(i=p_o+w_o+e_o;i<pcap_header->caplen;i++)
+	printf("all dump: (hex)\n");
+	for(i=p_o+w_o;i<pcap_header->caplen;i++)
 		printf("%x ",*(package+i));
 	printf("\n");
-	printf("all ethernet dump: (char)\n");
-	for(i=p_o+w_o+e_o;i<pcap_header->caplen;i++)
+	printf("all dump: (char)\n");
+	for(i=p_o+w_o;i<pcap_header->caplen;i++)
 		printf("%c ",*(package+i));
 	printf("\n");
 }