From a694777e91e8f0c54a9236a281653b191132e3dc Mon Sep 17 00:00:00 2001 From: hackbard Date: Tue, 12 Nov 2002 18:54:00 +0000 Subject: [PATCH] improved ip stuff --- hdw-sniff.c | 63 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/hdw-sniff.c b/hdw-sniff.c index 94830b7..46892b5 100644 --- a/hdw-sniff.c +++ b/hdw-sniff.c @@ -123,18 +123,18 @@ 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 ethhdr *e_hdr; - struct ip *ip_hdr; + struct iphdr *ip_hdr; struct info_struct *my_info_struct; 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); + + /* cache offsets */ + p_o=((strncmp(my_info_struct->dev,"wlan",4)==0)?sizeof(struct linux_wlan_ng_prism_hdr):0); + w_o=((strncmp(my_info_struct->dev,"wlan",4)==0)?sizeof(struct ieee802_11_hdr):0); + e_o=sizeof(struct ethhdr); + i_o=sizeof(struct iphdr); printf("\n"); printf("---> package %d ---- %s",my_info_struct->count, @@ -175,7 +175,7 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header, /* ieee802.3 */ /* ethernet */ - printf("ethernet:\n"); + printf("ethernet: (%d bytes)\n",e_o); e_hdr=(struct ethhdr *)(package+p_o+w_o); /* what types ? */ printf("type = "); @@ -186,22 +186,35 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header, printf(" src_addr = "); for(i=0;ih_source+i),((i==ETH_ALEN-1)?"\n":":")); + /* IP ? */ if(ntohs(e_hdr->h_proto)==ETH_P_IP) { - printf("ip protocol: "); - 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)); - printf("total_length(dec.) = %d \n",ntohs(ip_hdr->ip_len)); - printf("ip_addresses: source = "); - printf("%s\tdestination = %s\n",inet_ntoa(ip_hdr->ip_src), - inet_ntoa(ip_hdr->ip_dst)); - printf("ip_id = %x ",ntohs(ip_hdr->ip_id)); - printf("ip_offset = %x \n",ntohs(ip_hdr->ip_off)); - printf("time2live = %x ip_proto = %x\n",ntohs(ip_hdr->ip_ttl), - ntohs(ip_hdr->ip_p)); - printf("chksum: %x\n",ntohs(ip_hdr->ip_sum)); + printf("ip protocol: (%d bytes)\n",i_o); + ip_hdr=(struct iphdr *)(package+p_o+w_o+e_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("source_ip: "); + for(i=3;i>=0;--i) { + printf("%d%s", + ip_hdr->saddr&0xff<=0;--i) { + printf("%d%s", + ip_hdr->daddr&0xff<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:\n"); for(i=p_o+w_o+e_o;icaplen;i++) @@ -210,14 +223,14 @@ void pcap_process(u_char *info,const struct pcap_pkthdr *pcap_header, } int hop_channel(struct info_struct *info,int foo_fd) { + if((info->mmode-0x30==1) && (strncmp(info->dev,"wlan",4)==0)) { + struct iwreq my_iwreq; 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; @@ -226,7 +239,7 @@ int hop_channel(struct info_struct *info,int foo_fd) { perror("ioctl"); return -1; } - printf("debug: hopped to channel %d\n",info->channel); ++(info->channel); + } return 0; } -- 2.39.2