X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=hdw-sniff.c;h=fc67686898c7166950aa6dd017d2fd048711e3c5;hb=a813728bc725a4dbf1adc72b1336c395cce4b5fb;hp=f6da20f0559c471a12de85c28b66e6b8cb9b54b1;hpb=3fa4b2b00e5e3149c7d3c7cc354f58770ff9260f;p=my-code%2Fhdw-sniff.git

diff --git a/hdw-sniff.c b/hdw-sniff.c
index f6da20f..fc67686 100644
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -120,6 +120,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 			const u_char *package) {
 	
 	/* local variables */
+	char tmp_buf[20];
 	struct linux_wlan_ng_prism_hdr *prism_hdr;
 	struct ieee802_11_hdr *w_hdr;
 	struct ethhdr *e_hdr;
@@ -136,45 +137,76 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	e_o=sizeof(struct ethhdr);
 	i_o=sizeof(struct iphdr);
 
+	/* new package */
 	printf("\n");
 	printf("---> package %d ---- %s",my_info_struct->count,
 			ctime((const time_t*)&(pcap_header->ts.tv_sec)));
-	printf("pcap header:\n");
-	printf("capture_length: %d (dec.)\t",pcap_header->caplen);
-	printf("length(off wire): %d (dec.)\n",pcap_header->len);
 	
+	/* pcap header */
+	printf("pcap header: ");
+	printf("capture_length(dec): %d\t",pcap_header->caplen);
+	printf("off_wire_length(dec): %d\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)) {
 	printf("prism header: (%d bytes)\n",p_o);
 	prism_hdr=(struct linux_wlan_ng_prism_hdr *)package;
-	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;
-
+	printf("| message code/length: %d/%d |\t",prism_hdr->msgcode,
+						prism_hdr->msglen);
+	printf("device: %s |\n",prism_hdr->devname);
 	/* 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("fc: ");
+	for(i=0;i<16;i++)
+		printf("%s%d%s",(i==0?"|":""),
+				(((w_hdr->frame_ctl) & (1<<i))>0?1:0),
+				(i==15?"|\n":"|"));
+	printf("    | v | t |  s-t  |t|f|m|r|p|m|w|o|\n");
+	/* frame type */
+	/* management */
+	if(!(w_hdr->frame_ctl & 0x0c)) {
+	if((w_hdr->frame_ctl & IEEE802_11_STYPE_ASSOC_REQ)>0)
+		strcpy(tmp_buf,"association request");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_ASSOC_RESP)>0)
+		strcpy(tmp_buf,"association response");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_REASSOC_REQ)>0)
+		strcpy(tmp_buf,"reassociation request");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_REASSOC_RESP)>0)
+		strcpy(tmp_buf,"reassociation response");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_PROBE_REQ)>0)
+		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_ATIM)>0)
+		strcpy(tmp_buf,"announcement traffic indication message");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_DISASSOC)>0)
+		strcpy(tmp_buf,"disassociation");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_AUTH)>0)
+		strcpy(tmp_buf,"authentification");
+	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_DEAUTH)>0)
+		strcpy(tmp_buf,"deauthentification");
+	else strcpy(tmp_buf,"impossible situation \%) - go mail the author.");
 	}
-	printf("frame_control: %x duration_id: %x\n",ntohs(w_hdr->frame_ctl),
-						ntohs(w_hdr->duration_id));
+	else strcpy(tmp_buf,"control & monitor frame types not supported yet");
+	/* print out frame type */
+	printf("=> %s\n",tmp_buf);
+	
+	printf("duration/id: 0x%x\n",w_hdr->duration_id);
 	printf("version check ... %s\n",
-	((ntohs(w_hdr->frame_ctl) & IEEE802_11_FCTL_VERS)==0x00)?
+	((w_hdr->frame_ctl & IEEE802_11_FCTL_VERS)==0x00)?
 							"ok":"unknown");
-	// printf("type: 
-	/* skip ieee802.11 header */
-	// package=package+w_o;
 	}
 
 	/* ieee802.3 */
 	/* ethernet */
+	if((strncmp(my_info_struct->dev,"eth",3)==0) | 
+		((w_hdr->frame_ctl & IEEE802_11_FTYPE_DATA)>0)) {
 	printf("ethernet: (%d bytes)\n",e_o);
 	e_hdr=(struct ethhdr *)(package+p_o+w_o);
 	/* what types ? */
@@ -196,32 +228,32 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 		printf("service = %x ",ntohs(ip_hdr->tos));
 		printf("total_length(dec.) = %d \n",ntohs(ip_hdr->tot_len));
 		printf("source_ip: ");
-		for(i=3;i>=0;--i) {
+		for(i=0;i<=3;++i) {
 			printf("%d%s",
-			ip_hdr->saddr&0xff<<i,
-			(i==0?"\n":"."));
+			(ip_hdr->saddr&(0xff<<(8*i)))>>(8*i),
+			(i==3?"\n":"."));
 		}
 		printf("destination_ip: ");
-		for(i=3;i>=0;--i) {
+		for(i=0;i<=3;++i) {
 			printf("%d%s",
-			ip_hdr->daddr&0xff<<i,
-			(i==0?"\n":"."));
+			(ip_hdr->daddr&(0xff<<(8*i)))>>(8*i),
+			(i==3?"\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++)
+	}
+
+	/* check what we have ... */
+	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");
 }