X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=hdw-sniff.c;h=bd0b8edabee6a367ff58a8951fbd60ab5ab6d104;hb=f495a11c9e880f1f55aa8e6c44c065228e55e5c5;hp=8b35e82fb451388ff124767104b9957cacd9f141;hpb=326723124c4b55eccaa297c1636f9d345255d7bd;p=my-code%2Fhdw-sniff.git

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 8b35e82..bd0b8ed 100644
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -4,6 +4,8 @@
  * author: hackbard@hackdaworld.dyndns.org
  */
 
+#define _GNU_SOURCE
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -22,6 +24,7 @@
 #include <netinet/if_ether.h>  /* for ethhdr struct */
 #include <netinet/ip.h> /* ip */
 #include <netinet/in.h>	/* in_addr , inet_ntoa */
+#include <netinet/tcp.h> /* tcp header and protocols */
 
 /* IEEE 802.11 stuff -- will become one include later ... */
 #include "ieee80211.h" /* from hunz's aeolus, short hostap_wlan.h */
@@ -136,7 +139,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	struct beacon_struct *beacon_hdr;
 	struct ethhdr *e_hdr;
 	struct info_struct *my_info_struct;
-	int i,p_o,w_o,e_o,i_o;
+	int i,p_o,w_o,e_o,i_o,special_o=0;
 	
 	my_info_struct=(struct info_struct *)info;
 	++(my_info_struct->count);
@@ -169,7 +172,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	/* 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))) {
+	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));
 
@@ -204,9 +207,11 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 						:strcpy(tmp_buf1,"ibssid = ");
 		strncpy(tmp_buf2,beacon_hdr->ssid_s.ssid,
 				beacon_hdr->ssid_s.length);
+		
 		tmp_buf2[beacon_hdr->ssid_s.length]='\0';
 		strcpy(tmp_buf,"beacon");
-		add_ssid_2_list(tmp_buf2,my_info_struct->ssid_list);
+		add_ssid_2_list(tmp_buf2,beacon_hdr->capability,
+				my_info_struct->ssid_list);
 	}
 	else if((w_hdr->frame_ctl & IEEE802_11_STYPE_ATIM)>0)
 		strcpy(tmp_buf,"announcement traffic indication message");
@@ -221,7 +226,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	else strcpy(tmp_buf,"control or data frame type");
 
 	printf("=> %s\n",tmp_buf);
-	if(strlen(tmp_buf1)>0 & strlen(tmp_buf2)>0) printf("   %s%s\n",
+	if((strlen(tmp_buf1)>0) && (strlen(tmp_buf2)>0)) printf("   %s%s\n",
 							tmp_buf1,
 							tmp_buf2);
 	printf("duration/id: 0x%x\n",w_hdr->duration_id);
@@ -237,6 +242,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	if((strncmp(my_info_struct->dev,"eth",3)==0)) {
 		printf("ethernet: (%d bytes)\n",e_o);
 		e_hdr=(struct ethhdr *)(package+p_o+w_o);
+		special_o=sizeof(struct ethhdr);
 		/* what types ? */
 		printf("type = ");
 		printf("%x  ",ntohs(e_hdr->h_proto));
@@ -260,7 +266,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 			printf("- no encryption!\n");
 			if(snap_hdr->proto==ntohs(ETH_P_IP)) {
 				e_o=sizeof(struct snaphdr);
-				parse_ip(snap_hdr+e_o);
+				parse_ip((char *)(snap_hdr+e_o));
 			}
 
 		}
@@ -296,7 +302,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	/* dump it */
 #ifdef SHOW_HEX
 	printf("all dump: (hex)\n");
-	for(i=p_o+w_o;i<pcap_header->caplen;i++)
+	for(i=p_o+w_o+special_o;i<pcap_header->caplen;i++)
 		printf("%x ",*(package+i));
 	printf("\n");
 #endif
@@ -335,10 +341,10 @@ int parse_ip(char *ip_o) {
 
 	printf("ip protocol:\n");
 	ip_hdr=(struct iphdr *)ip_o;
-	printf("version = %x ",ntohs(ip_hdr->version));
-        printf("header_length = %x \n",ntohs(ip_hdr->ihl));
-        printf("service = %x ",ntohs(ip_hdr->tos));
-        printf("total_length(dec.) = %d \n",ntohs(ip_hdr->tot_len));
+	printf("version = %x ",ip_hdr->version);
+        printf("header_length = %x \n",ip_hdr->ihl);
+        printf("service = %x ",ip_hdr->tos);
+        printf("total_length(dec.) = %d \n",ip_hdr->tot_len);
         printf("source_ip: ");
         	for(i=0;i<=3;++i) {
                         printf("%d%s",
@@ -352,8 +358,26 @@ int parse_ip(char *ip_o) {
                 (i==3?"\n":"."));
 	}
 	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("ip_offset = %x \n",ip_hdr->frag_off);
+        printf("time2live = %x ip_proto = %x\n",ip_hdr->ttl,ip_hdr->protocol);
+	/* how to continue */
+	if(ip_hdr->protocol==IPPROTO_TCP) 
+			parse_tcp(ip_hdr+sizeof(struct iphdr));
+	if(ip_hdr->protocol==IPPROTO_UDP)
+			printf("udp package! get's parsed in the future\n");
         // printf("chksum: %x\n",ntohs(ip_hdr->ip_sum));
 }
+
+int parse_tcp(char *tcp_o) {
+	struct tcphdr *tcp_hdr;
+
+	printf("tcp protocol:\n");
+	tcp_hdr=(struct tcphdr *)tcp_o;
+	printf("source port: %d - dest port: %d\n",ntohs(tcp_hdr->source),
+						ntohs(tcp_hdr->dest));
+	printf("sequence: %d - ack sequence: %d\n",ntohs(tcp_hdr->seq),
+						ntohs(tcp_hdr->ack_seq));
+	printf("offset to data: %d - checksumm: %d\n",ntohs(tcp_hdr->doff)
+						,ntohs(tcp_hdr->check));
+	return 1;
+}