- fixed : display packet after a ping

first-developer · Oct 31, 2011 · 569cb51 · 569cb51
1 parent 62dc113
commit 569cb51
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 3 deletions.
diff --git a/Arrays/libarrays.a b/Arrays/libarrays.a
diff --git a/Events/libevents.a b/Events/libevents.a
diff --git a/NetTAP/libtap.a b/NetTAP/libtap.a
diff --git a/Stack/netarp.o b/Stack/netarp.o
diff --git a/Stack/netether.o b/Stack/netether.o
diff --git a/Stack/neticmp.c b/Stack/neticmp.c
@@ -48,13 +48,61 @@ unsigned char icmpDecodePacket(EventsEvent *event,EventsSelector *selector){
 
 	return 0;
 }
+/*
+    arraysSetValue(&icmp_infos,"type",&type,sizeof(unsigned char),0);
+    arraysSetValue(&icmp_infos,"code",&code,sizeof(unsigned char),0);
+    arraysSetValue(&icmp_infos,"data",data,reply_size,AARRAY_DONT_DUPLICATE);
+    arraysSetValue(&icmp_infos,"size",&reply_size,sizeof(int),0);
+    arraysSetValue(&icmp_infos,"ldst",&source,sizeof(IPv4Address),0);
+
+
+    unsigned char *data=(unsigned char *)arraysGetValue(infos,"data",NULL,0);
+    int size=*((int *)arraysGetValue(infos,"size",NULL,0));
+    arraysFreeArray(infos);
+    IPv4_fields *ip=(IPv4_fields *)data;
+    unsigned short int checksum=genericChecksum(data,4*IPv4_get_hlength(ip));
+*/
 
 //
 // Send ICMPv4 packet
 //
 
 unsigned char icmpSendPacket(EventsEvent *event,EventsSelector *selector){
 
+  // Get icmp data from the selector
+  AssocArray *infos=(AssocArray *)selector->data_this;
+/*
+  // Checking presence of ICMP attributes
+  if( arraysTestIndex(infos,"type",0)<0 || 
+      arraysTestIndex(infos,"code",0)<0)||
+      arraysTestIndex(infos,"size",0)<0)||
+      arraysTestIndex(infos,"data",0)<0) )
+  { arraysFreeArray(infos); return 1; } 
 	
+  // Get ICMP attributes: type, code, data
+  unsigned char *type=(unsigned char *)arraysGetValue(infos,"type",NULL,0); //type
+  unsigned char *code=(unsigned char *)arraysGetValue(infos,"code",NULL,0); //code
+  unsigned char *size=(unsigned char *)arraysGetValue(infos,"size",NULL,0); //size
+  unsigned char *data=(unsigned char *)arraysGetValue(infos,"data",NULL,0); //data
+
+  // Compute checksum
+  unsigned short int checksum=genericChecksum(data,size);
+
+  // et icmp header size
+  int icmp_header_size = 4;
+
+  // Init and set icmp header 
+  data=(unsigned char *)realloc(data, size+icmp_header_size);
+  memmove(data+4, data, size);
+  bzero(data,4);
+
+  arraysSetValue(&icmp_infos,"type",&type,sizeof(unsigned char),0);
+  arraysSetValue(&icmp_infos,"code",&code,sizeof(unsigned char),0);
+  arraysSetValue(&icmp_infos,"checksum",data,reply_size,AARRAY_DONT_DUPLICATE);
+  arraysSetValue(&icmp_infos,"size",&reply_size,sizeof(int),0);
+  arraysSetValue(&icmp_infos,"ldst",&source,sizeof(IPv4Address),0);
+  eventsTrigger(picmp->event_out,icmp_infos);  
+*/
+
 	return 0;
 }
diff --git a/Stack/neticmp.o b/Stack/neticmp.o
diff --git a/Stack/netip.c b/Stack/netip.c
@@ -119,7 +119,7 @@ if(checksum!=0){
 if(ip->ttl==0){
 #ifdef VERBOSE
   fprintf(stderr,"IP packet: null TTL !\n");
-
+#endif	
 	// ------------------------------------------------------------------
 	// Sending ICMP Time exceeded packet to the sender if ip->ttl == 0 
 	// ------------------------------------------------------------------
@@ -134,7 +134,7 @@ if(ip->ttl==0){
   	unsigned char type= ICMPV4_TYPE_TIME_EXCEEDED;
 
  		// Set the type of the ICMP message (ICMPV4_UNREACHABLE_CODE_NETWORK: 0)
-  	unsigned char code= ICMPV4_UNREACHABLE_CODE_NETWORK;
+  	unsigned char code= ICMPV4_CODE_NONE;
 
 		//  Get src address and data of the datagram sent
 		IPv4Address source=ip->source;
@@ -152,8 +152,8 @@ if(ip->ttl==0){
     arraysSetValue(&icmp_infos,"size",&reply_size,sizeof(int),0);
     arraysSetValue(&icmp_infos,"ldst",&source,sizeof(IPv4Address),0);
     eventsTrigger(picmp->event_out,icmp_infos);
+  }
 
-#endif
   free(data); return 0;
   }
 if(ntohs(ip->length)!=size){

diff --git a/Stack/netip.o b/Stack/netip.o
diff --git a/Stack/netudp.o b/Stack/netudp.o
diff --git a/Stack/processes.o b/Stack/processes.o
diff --git a/Stack/stack b/Stack/stack
diff --git a/Stack/stack.o b/Stack/stack.o