X-Git-Url: https://www.hackdaworld.org/gitweb/?a=blobdiff_plain;f=hdw-sniff.c;h=e49ec34ce7a03383a89e570730dcf44fa3a86bd1;hb=3cd7e5c91cc95ead863814a848096315c9a326c1;hp=174e00f7d20b7e46092051154a5674fb98f80245;hpb=da0b8f90085c39c74cc7243a3ca1aa96eb5e5153;p=my-code%2Fhdw-sniff.git

diff --git a/hdw-sniff.c b/hdw-sniff.c
index 174e00f..e49ec34 100644
--- a/hdw-sniff.c
+++ b/hdw-sniff.c
@@ -16,14 +16,17 @@
 
 #include "hdw-sniff.h" /* my functions */
 
+#define MAX_PACKAGES 3
+
 int main(int argc, char *argv[]) {
 
-	int i;
+	int i,count;
 	char pcap_error[PCAP_ERRBUF_SIZE];
 	pcap_t *pcap_handle;
 	const u_char *package;
 	struct pcap_pkthdr pcap_header;
 	struct ethhdr *e_hdr;
+	struct ip *ip_hdr;
 	struct ieee802_11_hdr *w_hdr;
 	
 	/* parse the arguments */
@@ -43,52 +46,44 @@ int main(int argc, char *argv[]) {
 	}
 	
 	/* grab a package until user breaks */
-	while (1) {
+	count=0;
+	while (count<MAX_PACKAGES) {
+	count++;
 	printf("\n");
-
-	printf("----| new package |----| hdw - sniff |----\n");
 	if((package=pcap_next(pcap_handle,&pcap_header))!=NULL) {
-		printf("package received at: %s",
-			ctime((const time_t*)&pcap_header.ts.tv_sec));
+		printf("---> package %d ---- %s",count,
+				ctime((const time_t*)&pcap_header.ts.tv_sec));
 		printf("pcap header: ");
 		printf("capture length=%d ",pcap_header.caplen);
 		printf("length(off wire)=%d\n",pcap_header.len);
 	}
 	
-	/* 802.11 or 802.3 -- not quite sure about 'D' & '\0' */
-	if(*package=='D') {
-		printf("ieee802.11: ");
-	}
-	else if(*package=='\0') {
-		printf("ethernet: ");
-		/* reading ethernet header */
-		e_hdr=(struct ethhdr *)package;
-		/* what types ? */
-		printf("types = ");
-		// for(i=0;i<2;i++)
-		printf("%x %x\n",
-			/* i==0?"0x":" ", */
-			*(e_hdr->h_proto)
-			/* i==1?"\n":"" */
-		);
-		printf("dest_addr = ");
-		for(i=0;i<ETH_ALEN;i++)
-		printf("%x%s",*(e_hdr->h_dest+i),((i==ETH_ALEN-1)?" ":":"));
-		printf(" src_addr = ");
-		for(i=0;i<ETH_ALEN;i++)
-		printf("%x%s",*(e_hdr->h_source+i),((i==ETH_ALEN-1)?"\n":":"));
-		printf("rest:\n");
-		for(i=sizeof(struct ethhdr);i<pcap_header.caplen;i++)
-			printf("%x ",*(package+i));
-		printf("\n");
-	}
-	else {
-		printf("unknown: ");
-		/* print the whole package in hex */
-		for(i=0;i<=pcap_header.caplen;i++) printf("%x ",*(package+i));
-		printf("\n");
-		printf("%c <- identifier for unknown!\n",*package);
+	/* is ieee802.11 ? -- we assume yes :) */
+	
+	
+	/* ethernet */
+	e_hdr=(struct ethhdr *)package;
+	/* what types ? */
+	printf("types = ");
+	printf("%x  ",ntohs(e_hdr->h_proto));
+	printf("dest_addr = ");
+	for(i=0;i<ETH_ALEN;i++)
+	printf("%x%s",*(e_hdr->h_dest+i),((i==ETH_ALEN-1)?" ":":"));
+	printf(" src_addr = ");
+	for(i=0;i<ETH_ALEN;i++)
+	printf("%x%s",*(e_hdr->h_source+i),((i==ETH_ALEN-1)?"\n":":"));
+	if(ntohs(e_hdr->h_proto)==ETH_P_IP) {
+		printf("ip protocol: ");
+		ip_hdr=(struct ip *)(package+sizeof(struct ethhdr));
+		printf("version = %x ",ntohs(ip_hdr->ip_v:4));
+		printf("header length = %x\n",ntohs(ip_hdr->ip_hl:4));
 	}
+	printf("rest:\n");
+	for(i=sizeof(struct ethhdr);i<pcap_header.caplen;i++)
+		printf("%x ",*(package+i));
+	printf("\n");
 	}
-	printf("just beacon frames, ha? - wake up early! :)");
+	printf("\n");
+	printf("just beacon frames, ha? - wake up early! :)\n");
+	printf("\n");
 }