X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=hdw-sniff.c;h=94830b7016942349254689f1fc9b8d4f99ba1417;hb=0819f943f6d301332559b998e67b8fbf13975f15;hp=8cbfb491e6e7fbda3e4d659a86b9fdd5cb2af645;hpb=8eca22db0981a42d3a9513b397d012a4c450789a;p=my-code%2Fhdw-sniff.git

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 8cbfb49..94830b7 100644
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[]) {
 
 	char pcap_error[PCAP_ERRBUF_SIZE];
 	pcap_t *pcap_handle;
-	int pcap_fd;
+	int pcap_fd,foo_fd;
 	fd_set pcap_fd_set;
 	struct timeval fd_set_tv;
 	char sys_call[30];
@@ -89,15 +89,27 @@ int main(int argc, char *argv[]) {
 
 	/* prepare for select */
 	pcap_fd=pcap_fileno(pcap_handle);
-	FD_ZERO(&pcap_fd_set);
-	FD_SET(pcap_fd,&pcap_fd_set);
-	fd_set_tv.tv_sec=0;
-	fd_set_tv.tv_usec=500000;
+
+	/* create file descriptor */
+	if((foo_fd=socket(AF_INET,SOCK_DGRAM,0))==-1) {
+		printf("unable to create socket foo_fd\n");
+		return -1;
+	}
 
 	/* do loopp */
-	while(1) {
-		if((select(pcap_fd+1,&pcap_fd_set,NULL,NULL,&fd_set_tv)) && (FD_ISSET(pcap_fd,&pcap_fd_set))) pcap_loop(pcap_handle,-1,pcap_process,(u_char *)&my_info_struct);
-		else hop_channel(&my_info_struct,pcap_fd);
+	while (1) {
+
+		/* set pcap_fd */
+		FD_ZERO(&pcap_fd_set);
+		FD_SET(pcap_fd,&pcap_fd_set);
+		fd_set_tv.tv_sec=0;
+		fd_set_tv.tv_usec=200000;
+
+		if((select(pcap_fd+1,&pcap_fd_set,NULL,NULL,&fd_set_tv)) && (FD_ISSET(pcap_fd,&pcap_fd_set))) pcap_dispatch(pcap_handle,-1,pcap_process,(u_char *)&my_info_struct);
+		else if((hop_channel(&my_info_struct,foo_fd))==-1) { 
+			printf("channelhopping failed, aborting\n");
+			return -1;
+		}
 	}
 	return 0;
 }
@@ -110,10 +122,16 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	/* local variables */
 	struct linux_wlan_ng_prism_hdr *prism_hdr;
 	struct ieee802_11_hdr *w_hdr;
-	struct ip *ip_hdr;
 	struct ethhdr *e_hdr;
+	struct ip *ip_hdr;
 	struct info_struct *my_info_struct;
-	int i;
+	int i,p_o,w_o,e_o,i_o;
+	
+	/* cache offsets */
+	p_o=sizeof(struct linux_wlan_ng_prism_hdr);
+	w_o=sizeof(struct ieee802_11_hdr);
+	e_o=sizeof(struct ethhdr);
+	i_o=sizeof(struct ip);
 
 	my_info_struct=(struct info_struct *)info;
 	++(my_info_struct->count);
@@ -128,16 +146,17 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 	/* prism wlan ng headers */
 	if((my_info_struct->mmode-0x30==1) && 
 		(strncmp(my_info_struct->dev,"wlan",4)==0)) {
-	printf("prism header:\n");
+	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;
 
 	/* ieee802.11 header */
-	printf("ieee802.11 header:\n");
-	package+=sizeof(struct linux_wlan_ng_prism_hdr);
-	w_hdr=(struct ieee802_11_hdr *)package;
+	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++) {
@@ -151,12 +170,13 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 							"ok":"unknown");
 	// printf("type: 
 	/* skip ieee802.11 header */
-	package=package+sizeof(struct ieee802_11_hdr);
+	// package=package+w_o;
 	}
 
 	/* ieee802.3 */
 	/* ethernet */
-	e_hdr=(struct ethhdr *)package;
+	printf("ethernet:\n");
+	e_hdr=(struct ethhdr *)(package+p_o+w_o);
 	/* what types ? */
 	printf("type = ");
 	printf("%x  ",ntohs(e_hdr->h_proto));
@@ -169,7 +189,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 		/* IP ? */
 	if(ntohs(e_hdr->h_proto)==ETH_P_IP) {
 		printf("ip protocol: ");
-		ip_hdr=(struct ip *)(package+sizeof(struct ethhdr));
+		ip_hdr=(struct ip *)(package+p_o+w_o+e_o);
 		printf("version = %x ",ntohs(ip_hdr->ip_v));
 		printf("header_length = %x \n",ntohs(ip_hdr->ip_hl));
 		printf("service = %x ",ntohs(ip_hdr->ip_tos));
@@ -183,27 +203,30 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header,
 						ntohs(ip_hdr->ip_p));
 		printf("chksum: %x\n",ntohs(ip_hdr->ip_sum));
 	}
-	printf("all_hex_dump:\n");
-	for(i=sizeof(struct ethhdr);i<pcap_header->caplen;i++)
+	printf("all ethernet dump:\n");
+	for(i=p_o+w_o+e_o;i<pcap_header->caplen;i++)
 		printf("%x ",*(package+i));
 	printf("\n");
 }
 
-int hop_channel(struct info_struct *info,int pcap_fd) {
+int hop_channel(struct info_struct *info,int foo_fd) {
 	struct iwreq my_iwreq;
 
-	if (info->channel==15) info->channel=1;
+	if (info->channel>=14) info->channel=1;
 
 	memset(&my_iwreq,0,sizeof(my_iwreq));
 	strcpy(my_iwreq.ifr_name,info->dev);
+	printf("debug: device = %s\n",my_iwreq.ifr_name);
+	printf("debug: %d\n",foo_fd);
+	printf("debug: channel = %d\n",info->channel);
 	my_iwreq.u.freq.e=0;
 	my_iwreq.u.freq.m=info->channel;
-	if((ioctl(pcap_fd,SIOCSIWFREQ,& my_iwreq))==-1) {
+	if((ioctl(foo_fd,SIOCSIWFREQ,&my_iwreq))==-1) {
 		printf("unable to hop channels\n");
+		perror("ioctl");
 		return -1;
 	}
 	printf("debug: hopped to channel %d\n",info->channel);
 	++(info->channel);
 	return 0;
 }
-