#include <strings.h>
#include <unistd.h>
#include <errno.h>
+#include <signal.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
#include "checksums.h"
+/*Use the DCCP source port to multiplex DCCP Ping streams by PID*/
+#define SRC_PORT_AS_PID_MULTIPLEX 1
+
+
#define MAX(x,y) (x>y ? x : y)
+extern int errno;
+
+
/*Structure for simpler IPv4/IPv6 Address handling*/
typedef union ipaddr{
struct sockaddr *gen;
struct sockaddr_in6 *ipv6;
} ipaddr_ptr_t;
+/*Possible Responses to a Request*/
enum responses{
UNKNOWN=0,
RESET,
DEST_UNREACHABLE,
TTL_EXPIRATION,
TOO_BIG,
- PARAMETER_PROBLEM
+ PARAMETER_PROBLEM,
+ DCCP_ERROR
};
-char* response_label[]= {
+
+/*Output strings corresponding to enum responses*/
+static const char* response_label[]= {
"Unknown",
"Closed Port (Reset)",
"Open Port (Response)",
"Destination Unreachable",
"TTL Expiration",
"Packet Too Big",
-"DCCP Not Supported (Parameter Problem)"
+"DCCP Not Supported (Parameter Problem)",
+"Protocol Error (DCCP Reset)"
};
-
+/*Structure to keep track of information about a request*/
struct request{
- int seq;
+ int request_seq;
+ int packet_seq;
int num_replies;
int num_errors;
struct timeval sent;
struct request *prev;
};
+/*Request Queue head structure*/
+struct request_queue{
+ struct request *head;
+ struct request *tail;
+};
+
+/*Statistics about the requests and replies sent*/
struct stats{
int requests_sent;
int replies_received;
struct timeval stop;
};
-struct request_queue{
- struct request *head;
- struct request *tail;
+struct params{
+ int count; /*Number of pings (-1 is infinity)*/
+ int dest_port; /*Destination port*/
+ int src_port; /*Source port---used to encode pid*/
+ int ttl; /*TTL*/
+ long interval; /*Delay between pings in ms*/
+ int ip_type; /*IPv4 or IPv6*/
+ ipaddr_ptr_t dest_addr; /*Destination Address*/
+ ipaddr_ptr_t src_addr; /*Source Address*/
};
-int debug=0; /*set to 1 to turn on debugging information*/
-int count=-1; /*Default number of pings (-1 is infinity)*/
-int dest_port=33434; /*Default port*/
-int ttl=64; /*Default TTL*/
-long interval=1000; /*Default delay between pings in ms*/
-int ip_type=AF_UNSPEC; /*IPv4 or IPv6*/
-ipaddr_ptr_t dest_addr; /*Destination Address*/
-ipaddr_ptr_t src_addr; /*Source Address*/
-struct request_queue queue;
-struct stats ping_stats;
-extern int errno;
+int debug=0; /*set to 1 to turn on debugging information*/
+struct request_queue queue; /*Queue of requests to track RTT/duplicate information*/
+struct stats ping_stats; /*Ping Statistics*/
+struct params parms; /*Parameters for ping*/
void getAddresses(char *src, char* dst);
void handleICMP6packet(int rcv_socket);
void buildRequestPacket(unsigned char* buffer, int *len, int seq);
void updateRequestPacket(unsigned char* buffer, int *len, int seq);
-int logPacket(int seq);
+void sendClose(int seq, u_int16_t ack_h, u_int32_t ack_l, int socket);
+void sendReset(int seq, u_int16_t ack_h, u_int32_t ack_l, int socket);
+int logPacket(int req_seq, int packet_seq);
int logResponse(ipaddr_ptr_t *src, int seq, int type);
-void dbgprintf(int level, const char *fmt, ...);
-void sanitize_environment();
+void clearQueue();
+void sigHandler();
void usage();
+void sanitize_environment();
+void dbgprintf(int level, const char *fmt, ...);
/*Parse commandline options*/
char c;
char *src=NULL;
char *dst=NULL;
+
+ /*Set Defaults*/
queue.head=NULL;
queue.tail=NULL;
ping_stats.replies_received=0;
ping_stats.rtt_max=0;
ping_stats.rtt_min=0;
ping_stats.errors=0;
+ parms.count=-1;
+ parms.dest_port=33434;
+ parms.ttl=64;
+ parms. interval=1000;
+ parms.ip_type=AF_UNSPEC;
+ parms.dest_addr.gen=NULL;
+ parms.src_addr.gen=NULL;
sanitize_environment();
while ((c = getopt(argc, argv, "64c:p:i:dt:S:")) != -1) {
switch (c) {
case '6':
- ip_type=AF_INET6;
+ parms.ip_type=AF_INET6;
break;
case '4':
- ip_type=AF_INET;
+ parms.ip_type=AF_INET;
break;
case 'c':
- count = atoi(optarg);
- if(count<=0){
+ parms.count = atoi(optarg);
+ if(parms.count<=0){
dbgprintf(0, "Error: count must be positive");
exit(1);
}
break;
case 'p':
- dest_port = atoi(optarg);
+ parms.dest_port = atoi(optarg);
break;
case 'i':
- interval = (long)(atof(optarg) * 1000.0);
- if (interval <= 0) {
- fprintf(stderr, "Invalid interval\n");
+ parms.interval = (long)(atof(optarg) * 1000.0);
+ if (parms.interval <= 0) {
+ dbgprintf(0, "Error: Invalid interval\n");
exit(1);
}
break;
debug++;
break;
case 't':
- ttl = atoi(optarg);
- if (ttl < 1 || ttl > 255) {
- fprintf(stderr, "Invalid TTL\n");
+ parms.ttl = atoi(optarg);
+ if (parms.ttl < 1 || parms.ttl > 255) {
+ dbgprintf(0,"Error: Invalid TTL\n");
}
break;
case 'S':
}
dst=argv[0];
+#if SRC_PORT_AS_PID_MULTIPLEX
+ /*Encode PID in source port*/
+ parms.src_port=(getpid()+1024)%65535;
+#else
+ parms.src_port=parms.dest_port;
+#endif
+
getAddresses(src, dst);
- if(src_addr.gen==NULL || dest_addr.gen==NULL){
+ if(parms.src_addr.gen==NULL || parms.dest_addr.gen==NULL){
dbgprintf(0,"Error: Can't determine source or destination address\n");
exit(1);
}
+ signal(SIGINT, sigHandler);
doping();
- free(src_addr.gen);
- free(dest_addr.gen);
+ free(parms.src_addr.gen);
+ free(parms.dest_addr.gen);
+ clearQueue();
return 0;
}
/*Lookup destination Address*/
memset(&hint,0,sizeof(struct addrinfo));
- hint.ai_family=ip_type;
+ hint.ai_family=parms.ip_type;
hint.ai_flags=AI_V4MAPPED | AI_ADDRCONFIG;
if((err=getaddrinfo(dst,NULL,&hint,&dtmp))!=0){
exit(1);
}else{
addrlen=dtmp->ai_addrlen;
- hint.ai_family=ip_type=dtmp->ai_family;
- dest_addr.gen=malloc(dtmp->ai_addrlen);
- if(dest_addr.gen==NULL){
+ hint.ai_family=parms.ip_type=dtmp->ai_family;
+ parms.dest_addr.gen=malloc(dtmp->ai_addrlen);
+ if(parms.dest_addr.gen==NULL){
dbgprintf(0,"Error: Can't allocate Memory\n");
exit(1);
}
- memcpy(dest_addr.gen,dtmp->ai_addr,dtmp->ai_addrlen);
+ memcpy(parms.dest_addr.gen,dtmp->ai_addr,dtmp->ai_addrlen);
}
freeaddrinfo(dtmp);
exit(1);
}else{
addrlen=stmp->ai_addrlen;
- src_addr.gen=malloc(stmp->ai_addrlen);
- if(src_addr.gen==NULL){
+ parms.src_addr.gen=malloc(stmp->ai_addrlen);
+ if(parms.src_addr.gen==NULL){
dbgprintf(0,"Error: Can't allocate Memory\n");
exit(1);
}
- memcpy(src_addr.gen,stmp->ai_addr,stmp->ai_addrlen);
+ memcpy(parms.src_addr.gen,stmp->ai_addr,stmp->ai_addrlen);
}
freeaddrinfo(stmp);
}else{
getifaddrs(&temp);
cur=temp;
while(cur!=NULL){
- if(cur->ifa_addr==NULL || cur->ifa_addr->sa_family!=ip_type){ /*Not matching ipv4/ipv6 of dest*/
+ if(cur->ifa_addr==NULL || cur->ifa_addr->sa_family!=parms.ip_type){
+ /*Not matching ipv4/ipv6 of dest*/
cur=cur->ifa_next;
continue;
}
}
}
- src_addr.gen=malloc(sizeof(struct sockaddr_storage));
- if(src_addr.gen==NULL){
+ parms.src_addr.gen=malloc(sizeof(struct sockaddr_storage));
+ if(parms.src_addr.gen==NULL){
dbgprintf(0,"Error: Can't allocate Memory\n");
exit(1);
}
- src_addr.gen->sa_family=ip_type;
- memcpy(src_addr.gen,cur->ifa_addr,addrlen);
+ parms.src_addr.gen->sa_family=parms.ip_type;
+ memcpy(parms.src_addr.gen,cur->ifa_addr,addrlen);
//break;
cur=cur->ifa_next;
}
struct timeval timeout;
struct timeval t,delay, add;
char pbuf[1000];
- int seq=1;
+ int request_seq=1;
+ int packet_seq;
/*Open Sockets*/
- rs=socket(ip_type, SOCK_RAW ,IPPROTO_RAW);
+ rs=socket(parms.ip_type, SOCK_RAW ,IPPROTO_RAW);
if(rs<0){
dbgprintf(0, "Error opening raw socket\n");
exit(1);
}
- ds=socket(ip_type, SOCK_RAW ,IPPROTO_DCCP);
+ ds=socket(parms.ip_type, SOCK_RAW ,IPPROTO_DCCP);
if(ds<0){
dbgprintf(0, "Error opening raw DCCP socket\n");
exit(1);
}
- is4=socket(ip_type,SOCK_RAW,IPPROTO_ICMP);
+ is4=socket(parms.ip_type,SOCK_RAW,IPPROTO_ICMP);
if(is4<0){
dbgprintf(0,"Error opening raw ICMPv4 socket\n");
exit(1);
}
- is6=socket(ip_type,SOCK_RAW,IPPROTO_ICMPV6);
+ is6=socket(parms.ip_type,SOCK_RAW,IPPROTO_ICMPV6);
if(is6<0){
dbgprintf(0,"Error opening raw ICMPv6 socket\n");
exit(1);
/*Build DCCP packet*/
- buildRequestPacket(sbuffer,&slen,seq);
- if(ip_type==AF_INET){
+ packet_seq=rand();
+ buildRequestPacket(sbuffer,&slen,packet_seq);
+ if(parms.ip_type==AF_INET){
addrlen=sizeof(struct sockaddr_in);
}else{
addrlen=sizeof(struct sockaddr_in6);
}
/*Start Message*/
- if(ip_type==AF_INET){
- dbgprintf(0, "PINGING %s on DCCP port %i\n",
- inet_ntop(ip_type, (void*)&dest_addr.ipv4->sin_addr, pbuf, 1000),dest_port);
+ if(parms.ip_type==AF_INET){
+ printf("PINGING %s on DCCP port %i\n",
+ inet_ntop(parms.ip_type, (void*)&parms.dest_addr.ipv4->sin_addr, pbuf, 1000),
+ parms.dest_port);
}else{
- dbgprintf(0, "PINGING %s on DCCP port %i\n",
- inet_ntop(ip_type, (void*)&dest_addr.ipv6->sin6_addr, pbuf, 1000),dest_port);
+ printf("PINGING %s on DCCP port %i\n",
+ inet_ntop(parms.ip_type, (void*)&parms.dest_addr.ipv6->sin6_addr, pbuf, 1000),
+ parms.dest_port);
}
while(!done){
/*Send Ping*/
- if(sendto(rs, &sbuffer, slen, MSG_DONTWAIT,(struct sockaddr*)dest_addr.gen,addrlen)<0){
- dbgprintf(0,"Error: sendto failed\n");
+ if(sendto(rs, &sbuffer, slen, MSG_DONTWAIT,(struct sockaddr*)parms.dest_addr.gen,addrlen)<0){
+ if(errno!=EINTR){
+ dbgprintf(0,"Error: sendto failed\n");
+ }
}
- if (logPacket(seq)<0){
+ if(parms.count==0){done=1; break;}
+
+ if (logPacket(request_seq,packet_seq)<0){
dbgprintf(0,"Error: Couldn't record request!\n");
}
- if(ip_type==AF_INET){
- dbgprintf(1, "Sending DCCP Request to %s\n",inet_ntop(ip_type, (void*)&dest_addr.ipv4->sin_addr, pbuf, 1000));
+ if(parms.ip_type==AF_INET){
+ dbgprintf(1, "Sending DCCP Request to %s\n",
+ inet_ntop(parms.ip_type, (void*)&parms.dest_addr.ipv4->sin_addr, pbuf, 1000));
}else{
- dbgprintf(1, "Sending DCCP Request to %s\n",inet_ntop(ip_type, (void*)&dest_addr.ipv6->sin6_addr, pbuf, 1000));
+ dbgprintf(1, "Sending DCCP Request to %s\n",
+ inet_ntop(parms.ip_type, (void*)&parms.dest_addr.ipv6->sin6_addr, pbuf, 1000));
}
/*Use select to wait on packets or until interval has passed*/
- add.tv_sec=interval/1000;
- add.tv_usec=(interval%1000)*1000;
+ add.tv_sec=parms.interval/1000;
+ add.tv_usec=(parms.interval%1000)*1000;
gettimeofday(&t,NULL);
timeradd(&t,&add,&delay);
while(timercmp(&t,&delay,<)){
/*Do select call*/
if(select(MAX(ds+1,MAX(is4+1,is6+1)),&sel, NULL,NULL,&timeout)<0){
- dbgprintf(0,"Select() error\n");
+ if(errno!=EINTR){
+ dbgprintf(0,"Select() error (%s)\n",strerror(errno));
+ }
}
+ if(parms.count==0){done=1;break;}
if(FD_ISSET(ds,&sel)){
/*Data on the DCCP socket*/
handleDCCPpacket(ds,rs);
}
- if(FD_ISSET(is4,&sel) && ip_type==AF_INET){
+ if(FD_ISSET(is4,&sel) && parms.ip_type==AF_INET){
/*Data on the ICMPv4 socket*/
handleICMP4packet(is4);
}
- if(FD_ISSET(is6,&sel) && ip_type==AF_INET6){
+ if(FD_ISSET(is6,&sel) && parms.ip_type==AF_INET6){
/*Data on the ICMPv6 socket*/
handleICMP6packet(is6);
}
}
/*Update count*/
- if(count>-1){
- count--;
+ if(parms.count>-1){
+ parms.count--;
}
- if(count==0){
- done=1;
- break;
- }
- seq++;
- updateRequestPacket(sbuffer,&slen, seq);
+ request_seq++;
+ packet_seq=rand();
+ updateRequestPacket(sbuffer,&slen, packet_seq);
}
close(rs);
socklen_t rcv_addr_len;
struct dccp_hdr *dhdr;
struct dccp_hdr_reset *dhdr_re;
+ struct dccp_hdr_ext *dhdre;
struct dccp_hdr_response *dhdr_rp;
struct dccp_hdr_ack_bits *dhdr_sync;
unsigned char* ptr;
/*Receive Packet*/
rcv_addr_len=sizeof(struct sockaddr_storage);
- if((rlen=recvfrom(rcv_socket, &rbuffer, 1000,0,rcv_addr.gen,&rcv_addr_len))<0){
+ if((rlen=recvfrom(rcv_socket, &rbuffer, 1500,0,rcv_addr.gen,&rcv_addr_len))<0){
+ if(errno!=EINTR){
dbgprintf(0, "Error on receive from DCCP socket (%s)\n",strerror(errno));
+ }
+ }
+ if(rlen<0){
+ return;
}
- if(rcv_addr.gen->sa_family!=ip_type){ //confirm IP type
- dbgprintf(1, "DCCP packet on %s. Tossing.\n", (ip_type==AF_INET) ? "IPv4" : "IPv6");
+ if(rcv_addr.gen->sa_family!=parms.ip_type){ //confirm IP type
+ dbgprintf(1, "DCCP packet on %s. Tossing.\n", (parms.ip_type==AF_INET) ? "IPv4" : "IPv6");
free(rcv_addr.gen);
return;
}
if(rcv_addr.gen->sa_family==AF_INET){
/*IPv4*/
- if(memcmp(&rcv_addr.ipv4->sin_addr,&dest_addr.ipv4->sin_addr,
- sizeof(dest_addr.ipv4->sin_addr))!=0){ //not from destination
+ if(memcmp(&rcv_addr.ipv4->sin_addr,&parms.dest_addr.ipv4->sin_addr,
+ sizeof(parms.dest_addr.ipv4->sin_addr))!=0){ //not from destination
dbgprintf(1,"DCCP packet from 3rd host\n");
free(rcv_addr.gen);
return;
ptr=rbuffer+iph->ihl*4;
}else{
/*IPv6*/
- if(memcmp(&rcv_addr.ipv6->sin6_addr, &dest_addr.ipv6->sin6_addr,
- sizeof(dest_addr.ipv6->sin6_addr))!=0){ //not from destination
+ if(memcmp(&rcv_addr.ipv6->sin6_addr, &parms.dest_addr.ipv6->sin6_addr,
+ sizeof(parms.dest_addr.ipv6->sin6_addr))!=0){ //not from destination
dbgprintf(1,"DCCP packet from 3rd host\n");
free(rcv_addr.gen);
return;
/*DCCP checks*/
dhdr=(struct dccp_hdr*)ptr;
- if(dhdr->dccph_sport!=htons(dest_port)){
+ if(dhdr->dccph_sport!=htons(parms.dest_port)){
dbgprintf(1,"DCCP packet with wrong Source Port (%i)\n", ntohs(dhdr->dccph_sport));
free(rcv_addr.gen);
return;
}
- if(dhdr->dccph_dport!=htons(dest_port)){
+ if(dhdr->dccph_dport!=htons(parms.src_port)){
dbgprintf(1,"DCCP packet with wrong Destination Port\n");
free(rcv_addr.gen);
return;
/*Pick Response*/
if(dhdr->dccph_type==DCCP_PKT_RESET){
if(rlen < (ptr-rbuffer)+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext)+sizeof(struct dccp_hdr_reset)){
- dbgprintf(1, "Error: Reset packet too small!");
+ dbgprintf(1, "Tossing DCCP Reset packet that's small!\n");
return;
}
dhdr_re=(struct dccp_hdr_reset*)(ptr+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext));
- logResponse(&rcv_addr, ntohl(dhdr_re->dccph_reset_ack.dccph_ack_nr_low), RESET);
+
+ /*Log*/
+ if(dhdr_re->dccph_reset_code==DCCP_RESET_CODE_NO_CONNECTION){
+ logResponse(&rcv_addr, ntohl(dhdr_re->dccph_reset_ack.dccph_ack_nr_low), RESET);
+ }else{
+ logResponse(&rcv_addr, ntohl(dhdr_re->dccph_reset_ack.dccph_ack_nr_low), DCCP_ERROR);
+ }
/*Nothing else to do*/
}
if(dhdr->dccph_type==DCCP_PKT_RESPONSE){
if(rlen < (ptr-rbuffer)+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext)+sizeof(struct dccp_hdr_response)){
- dbgprintf(1, "Error: Response packet too small!");
+ dbgprintf(1, "Tossing DCCP Response packet that's too small!\n");
return;
}
+
+ /*Log*/
+ dhdre=(struct dccp_hdr_ext*)(ptr+sizeof(struct dccp_hdr));
dhdr_rp=(struct dccp_hdr_response*)(ptr+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext));
logResponse(&rcv_addr,ntohl(dhdr_rp->dccph_resp_ack.dccph_ack_nr_low),RESPONSE);
- /*TODO:Send Close back*/
+
+ /*Send Close*/
+ sendClose(ntohl(dhdr_rp->dccph_resp_ack.dccph_ack_nr_low),
+ dhdr->dccph_seq, dhdre->dccph_seq_low,send_socket);
}
if(dhdr->dccph_type==DCCP_PKT_SYNC || dhdr->dccph_type==DCCP_PKT_SYNCACK){
if(rlen < (ptr-rbuffer)+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext)+sizeof(struct dccp_hdr_ack_bits)){
- dbgprintf(1, "Error: Response packet too small!");
+ dbgprintf(1, "Tossing DCCP Sync/SyncAck packet that's too small!\n");
return;
}
+
+ /*Log*/
+ dhdre=(struct dccp_hdr_ext*)(ptr+sizeof(struct dccp_hdr));
dhdr_sync=(struct dccp_hdr_ack_bits*)(ptr+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext));
logResponse(&rcv_addr,ntohl(dhdr_sync->dccph_ack_nr_low),SYNC);
- /*TODO:Send Reset*/
+
+ /*Send Reset*/
+ sendReset(ntohl(dhdr_sync->dccph_ack_nr_low),
+ dhdr->dccph_seq, dhdre->dccph_seq_low,send_socket);
}
free(rcv_addr.gen);
struct dccp_hdr *dhdr;
struct dccp_hdr_ext *dhdre;
struct iphdr* ip4hdr;
+ struct iphdr* iph;
int type;
/*Memory for socket address*/
}
/*Receive Packet*/
- if((rlen=recvfrom(rcv_socket, &rbuffer, 1000,0,rcv_addr.gen,&rcv_addr_len))<0){
- dbgprintf(0, "Error on receive from ICMPv4 socket (%s)\n",strerror(errno));
+ if((rlen=recvfrom(rcv_socket, &rbuffer, 1500,0,rcv_addr.gen,&rcv_addr_len))<0){
+ if(errno!=EINTR){
+ dbgprintf(0, "Error on receive from ICMPv4 socket (%s)\n",strerror(errno));
+ }
}
+ if(rlen<0){
+ return;
+ }
+
+ iph=(struct iphdr*)rbuffer;
- if(rlen < sizeof(struct icmphdr)){ //check packet size
+
+ if(rlen < sizeof(struct icmphdr)+sizeof(struct iphdr)){ //check packet size
dbgprintf(1, "Packet smaller than possible ICMPv4 packet!\n");
free(rcv_addr.gen);
return;
}
- icmp4=(struct icmphdr*)rbuffer;
+ icmp4=(struct icmphdr*)(rbuffer+iph->ihl*4);
if(icmp4->type!=ICMP_DEST_UNREACH && icmp4->type!=ICMP_TIME_EXCEEDED){ //check icmp types
dbgprintf(1, "Tossing ICMPv4 packet of type %i\n", icmp4->type);
free(rcv_addr.gen);
}
/*Check packet size again*/
- if(rlen<sizeof(struct icmphdr)+sizeof(struct iphdr)+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext)){
+ if(rlen<sizeof(struct icmphdr)+2*sizeof(struct iphdr)+4){
dbgprintf(1, "Tossing ICMPv4 packet that's too small to contain DCCP header!\n");
free(rcv_addr.gen);
return;
}
/*Decode IPv4 header*/
- ip4hdr=(struct iphdr*)(rbuffer+sizeof(struct icmphdr));
- if(memcmp(&src_addr.ipv4->sin_addr,&ip4hdr->saddr,sizeof(src_addr.ipv4->sin_addr))!=0){
+ ip4hdr=(struct iphdr*)(rbuffer+iph->ihl*4+sizeof(struct icmphdr));
+ if(memcmp(&parms.src_addr.ipv4->sin_addr,&ip4hdr->saddr,sizeof(parms.src_addr.ipv4->sin_addr))!=0){
/*Source address doesn't match*/
+ dbgprintf(1,"Tossing ICMPv4 packet because the embedded IPv4 source address isn't us\n");
free(rcv_addr.gen);
return;
}
- if(memcmp(&dest_addr.ipv4->sin_addr,&ip4hdr->daddr,sizeof(dest_addr.ipv4->sin_addr))!=0){
+ if(memcmp(&parms.dest_addr.ipv4->sin_addr,&ip4hdr->daddr,sizeof(parms.dest_addr.ipv4->sin_addr))!=0){
/*Destination address doesn't match*/
+ dbgprintf(1,"Tossing ICMPv4 packet because the embedded IPv4 destination address isn't our target\n");
free(rcv_addr.gen);
return;
}
if(ip4hdr->protocol!=IPPROTO_DCCP){
/*Not DCCP!*/
+ dbgprintf(1,"Tossing ICMPv4 packet because the embedded packet isn't DCCP\n");
free(rcv_addr.gen);
return;
}
/*Decode DCCP header*/
- dhdr=(struct dccp_hdr*)(rbuffer+sizeof(struct icmphdr)+ip4hdr->ihl*4);
- if(dhdr->dccph_dport!=htons(dest_port)){
+ dhdr=(struct dccp_hdr*)(rbuffer+iph->ihl*4+sizeof(struct icmphdr)+ip4hdr->ihl*4);
+ if(dhdr->dccph_dport!=htons(parms.dest_port)){
/*DCCP Destination Ports don't match*/
+ dbgprintf(1,"Tossing ICMPv4 packet because the embedded packet doesn't have our DCCP destination port\n");
free(rcv_addr.gen);
return;
}
- if(dhdr->dccph_sport!=htons(dest_port)){
+ if(dhdr->dccph_sport!=htons(parms.src_port)){
/*DCCP Source Ports don't match*/
+ dbgprintf(1,"Tossing ICMPv4 packet because the embedded packet doesn't have our DCCP source port\n");
free(rcv_addr.gen);
return;
}
- dhdre=(struct dccp_hdr_ext*)(rbuffer+sizeof(struct icmphdr)+ip4hdr->ihl*4+sizeof(struct dccp_hdr));
+ dhdre=(struct dccp_hdr_ext*)(rbuffer+iph->ihl*4+sizeof(struct icmphdr)+ip4hdr->ihl*4+sizeof(struct dccp_hdr));
/*Log*/
if(icmp4->type==ICMP_DEST_UNREACH){
if(icmp4->type==ICMP_TIME_EXCEEDED){
type=TTL_EXPIRATION;
}
- logResponse(&rcv_addr,ntohl(dhdre->dccph_seq_low),type);
+ if(rlen<sizeof(struct icmphdr)+2*sizeof(struct iphdr)+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext)){
+ logResponse(&rcv_addr,-1,type);
+ }else{
+ logResponse(&rcv_addr,ntohl(dhdre->dccph_seq_low),type);
+ }
free(rcv_addr.gen);
return;
}
}
/*Receive Packet*/
- if((rlen=recvfrom(rcv_socket, &rbuffer, 1000,0,rcv_addr.gen,&rcv_addr_len))<0){
+ if((rlen=recvfrom(rcv_socket, &rbuffer, 1500,0,rcv_addr.gen,&rcv_addr_len))<0){
dbgprintf(0, "Error on receive from ICMPv6 socket (%s)\n",strerror(errno));
}
/*Decode IPv6 header*/
ip6hdr=(struct ip6_hdr*)(rbuffer+sizeof(struct icmp6_hdr));
- if(memcmp(&src_addr.ipv6->sin6_addr,&ip6hdr->ip6_src,sizeof(src_addr.ipv6->sin6_addr))!=0){
+ if(memcmp(&parms.src_addr.ipv6->sin6_addr,&ip6hdr->ip6_src,sizeof(parms.src_addr.ipv6->sin6_addr))!=0){
+ dbgprintf(1,"Tossing ICMPv6 packet because the embedded IPv6 source address isn't us\n");
/*Source address doesn't match*/
free(rcv_addr.gen);
return;
}
- if(memcmp(&dest_addr.ipv6->sin6_addr,&ip6hdr->ip6_dst,sizeof(dest_addr.ipv6->sin6_addr))!=0){
+ if(memcmp(&parms.dest_addr.ipv6->sin6_addr,&ip6hdr->ip6_dst,sizeof(parms.dest_addr.ipv6->sin6_addr))!=0){
/*Destination address doesn't match*/
+ dbgprintf(1,"Tossing ICMPv6 packet because the embedded IPv6 destination address isn't our target\n");
free(rcv_addr.gen);
return;
}
if(ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_nxt!=IPPROTO_DCCP){
/*Not DCCP!*/
+ dbgprintf(1,"Tossing ICMPv6 packet because the embedded packet isn't DCCP\n");
free(rcv_addr.gen);
return;
}
/*Decode DCCP header*/
dhdr=(struct dccp_hdr*)(rbuffer+sizeof(struct icmp6_hdr)+sizeof(struct ip6_hdr));
- if(dhdr->dccph_dport!=htons(dest_port)){
+ if(dhdr->dccph_dport!=htons(parms.dest_port)){
/*DCCP Destination Ports don't match*/
+ dbgprintf(1,"Tossing ICMPv6 packet because the embedded packet doesn't have our DCCP destination port\n");
free(rcv_addr.gen);
return;
}
- if(dhdr->dccph_sport!=htons(dest_port)){
+ if(dhdr->dccph_sport!=htons(parms.src_port)){
/*DCCP Source Ports don't match*/
+ dbgprintf(1,"Tossing ICMPv6 packet because the embedded packet doesn't have our DCCP source port\n");
free(rcv_addr.gen);
return;
}
dhdre=(struct dccp_hdr_ext*)(rbuffer+sizeof(struct icmp6_hdr)+sizeof(struct ip6_hdr)+sizeof(struct dccp_hdr));
-
-
/*Log*/
if(icmp6->icmp6_type==ICMP6_DST_UNREACH){
type=DEST_UNREACHABLE;
/*IP header*/
ip4hdr=NULL;
- if(ip_type==AF_INET){
+ if(parms.ip_type==AF_INET){
ip_hdr_len=sizeof(struct iphdr);
ip4hdr=(struct iphdr*)buffer;
ip4hdr->check=htons(0);
- memcpy(&ip4hdr->daddr, &dest_addr.ipv4->sin_addr, sizeof(dest_addr.ipv4->sin_addr));
+ memcpy(&ip4hdr->daddr, &parms.dest_addr.ipv4->sin_addr, sizeof(parms.dest_addr.ipv4->sin_addr));
ip4hdr->frag_off=htons(0);
ip4hdr->id=htons(1);//first
ip4hdr->ihl=5;
ip4hdr->protocol=IPPROTO_DCCP;
- memcpy(&ip4hdr->saddr, &src_addr.ipv4->sin_addr, sizeof(src_addr.ipv4->sin_addr));
+ memcpy(&ip4hdr->saddr, &parms.src_addr.ipv4->sin_addr, sizeof(parms.src_addr.ipv4->sin_addr));
ip4hdr->tos=0;
ip4hdr->tot_len=htons(ip_hdr_len+dccp_hdr_len);
- ip4hdr->ttl=ttl;
+ ip4hdr->ttl=parms.ttl;
ip4hdr->version=4;
}else{
ip_hdr_len=sizeof(struct ip6_hdr);
ip6hdr=(struct ip6_hdr*)buffer;
- memcpy(&ip6hdr->ip6_dst, &dest_addr.ipv6->sin6_addr, sizeof(dest_addr.ipv6->sin6_addr));
- memcpy(&ip6hdr->ip6_src, &src_addr.ipv6->sin6_addr, sizeof(src_addr.ipv6->sin6_addr));
+ memcpy(&ip6hdr->ip6_dst, &parms.dest_addr.ipv6->sin6_addr, sizeof(parms.dest_addr.ipv6->sin6_addr));
+ memcpy(&ip6hdr->ip6_src, &parms.src_addr.ipv6->sin6_addr, sizeof(parms.src_addr.ipv6->sin6_addr));
ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_flow=htonl(6<<28); //version, traffic class, flow label
- ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_hlim=ttl;
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_hlim=parms.ttl;
ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_nxt=IPPROTO_DCCP;
ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_plen=htons(dccp_hdr_len);
}
dhdr->dccph_checksum=0;
dhdr->dccph_cscov=0;
dhdr->dccph_doff=dccp_hdr_len/4;
- dhdr->dccph_dport=htons(dest_port);
+ dhdr->dccph_dport=htons(parms.dest_port);
dhdr->dccph_reserved=0;
- dhdr->dccph_sport=htons(dest_port);
+ dhdr->dccph_sport=htons(parms.src_port);
dhdr->dccph_x=1;
dhdr->dccph_type=DCCP_PKT_REQUEST;
dhdr->dccph_seq2=htonl(0); //Reserved if using 48 bit sequence numbers
dhdrr->dccph_req_service= htonl(0x50455246);
/*Checksums*/
- if(ip_type==AF_INET){
+ if(parms.ip_type==AF_INET){
dhdr->dccph_checksum=ipv4_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
- (unsigned char*) &dest_addr.ipv4->sin_addr,
- (unsigned char*)&src_addr.ipv4->sin_addr, IPPROTO_DCCP);
+ (unsigned char*) &parms.dest_addr.ipv4->sin_addr,
+ (unsigned char*)&parms.src_addr.ipv4->sin_addr, IPPROTO_DCCP);
ip4hdr->check=ipv4_chksum(buffer,ip_hdr_len);
}else{
dhdr->dccph_checksum=ipv6_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
- (unsigned char*) &dest_addr.ipv6->sin6_addr,
- (unsigned char*)&src_addr.ipv6->sin6_addr, IPPROTO_DCCP);
+ (unsigned char*) &parms.dest_addr.ipv6->sin6_addr,
+ (unsigned char*)&parms.src_addr.ipv6->sin6_addr, IPPROTO_DCCP);
}
*len=ip_hdr_len+dccp_hdr_len;
return;
/*IP header*/
ip4hdr=NULL;
- if(ip_type==AF_INET){
+ if(parms.ip_type==AF_INET){
ip_hdr_len=sizeof(struct iphdr);
ip4hdr=(struct iphdr*)buffer;
ip4hdr->check=htons(0);
dhdre->dccph_seq_low=htonl(seq);
/*Checksums*/
- if(ip_type==AF_INET){
+ if(parms.ip_type==AF_INET){
dhdr->dccph_checksum=ipv4_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
- (unsigned char*) &dest_addr.ipv4->sin_addr,
- (unsigned char*)&src_addr.ipv4->sin_addr, IPPROTO_DCCP);
+ (unsigned char*) &parms.dest_addr.ipv4->sin_addr,
+ (unsigned char*)&parms.src_addr.ipv4->sin_addr, IPPROTO_DCCP);
ip4hdr->check=ipv4_chksum(buffer,ip_hdr_len);
}else{
dhdr->dccph_checksum=ipv6_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
- (unsigned char*) &dest_addr.ipv6->sin6_addr,
- (unsigned char*)&src_addr.ipv6->sin6_addr, IPPROTO_DCCP);
+ (unsigned char*) &parms.dest_addr.ipv6->sin6_addr,
+ (unsigned char*)&parms.src_addr.ipv6->sin6_addr, IPPROTO_DCCP);
}
*len=ip_hdr_len+dccp_hdr_len;
return;
}
-int logPacket(int seq){
+void sendClose(int seq, u_int16_t ack_h, u_int32_t ack_l, int socket){
+ unsigned char buffer[1500];
+ struct dccp_hdr *dhdr;
+ struct dccp_hdr_ext *dhdre;
+ struct dccp_hdr_ack_bits *dhd_ack;
+ struct iphdr* ip4hdr;
+ struct ip6_hdr* ip6hdr;
+ int len;
+ int addrlen;
+
+ int ip_hdr_len;
+ int dccp_hdr_len=sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext)+sizeof(struct dccp_hdr_ack_bits);
+
+ memset(buffer, 0, 1500);
+
+ /*IP header*/
+ ip4hdr=NULL;
+ if(parms.ip_type==AF_INET){
+ ip_hdr_len=sizeof(struct iphdr);
+ ip4hdr=(struct iphdr*)buffer;
+ ip4hdr->check=htons(0);
+ memcpy(&ip4hdr->daddr, &parms.dest_addr.ipv4->sin_addr, sizeof(parms.dest_addr.ipv4->sin_addr));
+ ip4hdr->frag_off=htons(0);
+ ip4hdr->id=htons(1);//first
+ ip4hdr->ihl=5;
+ ip4hdr->protocol=IPPROTO_DCCP;
+ memcpy(&ip4hdr->saddr, &parms.src_addr.ipv4->sin_addr, sizeof(parms.src_addr.ipv4->sin_addr));
+ ip4hdr->tos=0;
+ ip4hdr->tot_len=htons(ip_hdr_len+dccp_hdr_len);
+ ip4hdr->ttl=parms.ttl;
+ ip4hdr->version=4;
+ }else{
+ ip_hdr_len=sizeof(struct ip6_hdr);
+ ip6hdr=(struct ip6_hdr*)buffer;
+ memcpy(&ip6hdr->ip6_dst, &parms.dest_addr.ipv6->sin6_addr, sizeof(parms.dest_addr.ipv6->sin6_addr));
+ memcpy(&ip6hdr->ip6_src, &parms.src_addr.ipv6->sin6_addr, sizeof(parms.src_addr.ipv6->sin6_addr));
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_flow=htonl(6<<28); //version, traffic class, flow label
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_hlim=parms.ttl;
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_nxt=IPPROTO_DCCP;
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_plen=htons(dccp_hdr_len);
+ }
+
+ /*DCCP header*/
+ dhdr=(struct dccp_hdr*)(buffer+ip_hdr_len);
+ dhdre=(struct dccp_hdr_ext*)(buffer+ip_hdr_len+sizeof(struct dccp_hdr));
+ dhd_ack=(struct dccp_hdr_ack_bits*)(buffer+ip_hdr_len+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext));
+ dhdr->dccph_ccval=0;
+ dhdr->dccph_checksum=0;
+ dhdr->dccph_cscov=0;
+ dhdr->dccph_doff=dccp_hdr_len/4;
+ dhdr->dccph_dport=htons(parms.dest_port);
+ dhdr->dccph_reserved=0;
+ dhdr->dccph_sport=htons(parms.src_port);
+ dhdr->dccph_x=1;
+ dhdr->dccph_type=DCCP_PKT_CLOSE;
+ dhdr->dccph_seq2=htonl(0); //Reserved if using 48 bit sequence numbers
+ dhdr->dccph_seq=htonl(0); //High 16bits of sequence number. Always make 0 for simplicity.
+ dhdre->dccph_seq_low=htonl(seq+1);
+ dhd_ack->dccph_ack_nr_high=ack_h;
+ dhd_ack->dccph_ack_nr_low=ack_l;
+
+ /*Checksums*/
+ if(parms.ip_type==AF_INET){
+ dhdr->dccph_checksum=ipv4_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
+ (unsigned char*) &parms.dest_addr.ipv4->sin_addr,
+ (unsigned char*)&parms.src_addr.ipv4->sin_addr, IPPROTO_DCCP);
+ ip4hdr->check=ipv4_chksum(buffer,ip_hdr_len);
+ }else{
+ dhdr->dccph_checksum=ipv6_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
+ (unsigned char*) &parms.dest_addr.ipv6->sin6_addr,
+ (unsigned char*)&parms.src_addr.ipv6->sin6_addr, IPPROTO_DCCP);
+ }
+ len=ip_hdr_len+dccp_hdr_len;
+
+ /*Send*/
+ if(parms.ip_type==AF_INET){
+ addrlen=sizeof(struct sockaddr_in);
+ }else{
+ addrlen=sizeof(struct sockaddr_in6);
+ }
+ if(sendto(socket, &buffer, len, MSG_DONTWAIT,(struct sockaddr*)parms.dest_addr.gen,addrlen)<0){
+ if(errno!=EINTR){
+ dbgprintf(0,"Error: sendto failed\n");
+ }
+ }
+ return;
+}
+
+void sendReset(int seq, u_int16_t ack_h, u_int32_t ack_l, int socket){
+ unsigned char buffer[1500];
+ struct dccp_hdr *dhdr;
+ struct dccp_hdr_ext *dhdre;
+ struct dccp_hdr_reset *dh_re;
+ struct iphdr* ip4hdr;
+ struct ip6_hdr* ip6hdr;
+ int len;
+ int addrlen;
+
+ int ip_hdr_len;
+ int dccp_hdr_len=sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext)+sizeof(struct dccp_hdr_reset);
+
+ memset(buffer, 0, 1500);
+
+ /*IP header*/
+ ip4hdr=NULL;
+ if(parms.ip_type==AF_INET){
+ ip_hdr_len=sizeof(struct iphdr);
+ ip4hdr=(struct iphdr*)buffer;
+ ip4hdr->check=htons(0);
+ memcpy(&ip4hdr->daddr, &parms.dest_addr.ipv4->sin_addr, sizeof(parms.dest_addr.ipv4->sin_addr));
+ ip4hdr->frag_off=htons(0);
+ ip4hdr->id=htons(1);//first
+ ip4hdr->ihl=5;
+ ip4hdr->protocol=IPPROTO_DCCP;
+ memcpy(&ip4hdr->saddr, &parms.src_addr.ipv4->sin_addr, sizeof(parms.src_addr.ipv4->sin_addr));
+ ip4hdr->tos=0;
+ ip4hdr->tot_len=htons(ip_hdr_len+dccp_hdr_len);
+ ip4hdr->ttl=parms.ttl;
+ ip4hdr->version=4;
+ }else{
+ ip_hdr_len=sizeof(struct ip6_hdr);
+ ip6hdr=(struct ip6_hdr*)buffer;
+ memcpy(&ip6hdr->ip6_dst, &parms.dest_addr.ipv6->sin6_addr, sizeof(parms.dest_addr.ipv6->sin6_addr));
+ memcpy(&ip6hdr->ip6_src, &parms.src_addr.ipv6->sin6_addr, sizeof(parms.src_addr.ipv6->sin6_addr));
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_flow=htonl(6<<28); //version, traffic class, flow label
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_hlim=parms.ttl;
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_nxt=IPPROTO_DCCP;
+ ip6hdr->ip6_ctlun.ip6_un1.ip6_un1_plen=htons(dccp_hdr_len);
+ }
+
+ /*DCCP header*/
+ dhdr=(struct dccp_hdr*)(buffer+ip_hdr_len);
+ dhdre=(struct dccp_hdr_ext*)(buffer+ip_hdr_len+sizeof(struct dccp_hdr));
+ dh_re=(struct dccp_hdr_reset*)(buffer+ip_hdr_len+sizeof(struct dccp_hdr)+sizeof(struct dccp_hdr_ext));
+ dhdr->dccph_ccval=0;
+ dhdr->dccph_checksum=0;
+ dhdr->dccph_cscov=0;
+ dhdr->dccph_doff=dccp_hdr_len/4;
+ dhdr->dccph_dport=htons(parms.dest_port);
+ dhdr->dccph_reserved=0;
+ dhdr->dccph_sport=htons(parms.src_port);
+ dhdr->dccph_x=1;
+ dhdr->dccph_type=DCCP_PKT_RESET;
+ dhdr->dccph_seq2=htonl(0); //Reserved if using 48 bit sequence numbers
+ dhdr->dccph_seq=htonl(0); //High 16bits of sequence number. Always make 0 for simplicity.
+ dhdre->dccph_seq_low=htonl(seq+1);
+ dh_re->dccph_reset_ack.dccph_ack_nr_high=ack_h;
+ dh_re->dccph_reset_ack.dccph_ack_nr_low=ack_l;
+ dh_re->dccph_reset_code=DCCP_RESET_CODE_CLOSED;
+ dh_re->dccph_reset_data[0]=0;
+ dh_re->dccph_reset_data[1]=0;
+ dh_re->dccph_reset_data[2]=0;
+
+ /*Checksums*/
+ if(parms.ip_type==AF_INET){
+ dhdr->dccph_checksum=ipv4_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
+ (unsigned char*) &parms.dest_addr.ipv4->sin_addr,
+ (unsigned char*)&parms.src_addr.ipv4->sin_addr, IPPROTO_DCCP);
+ ip4hdr->check=ipv4_chksum(buffer,ip_hdr_len);
+ }else{
+ dhdr->dccph_checksum=ipv6_pseudohdr_chksum((buffer+ip_hdr_len), dccp_hdr_len,
+ (unsigned char*) &parms.dest_addr.ipv6->sin6_addr,
+ (unsigned char*)&parms.src_addr.ipv6->sin6_addr, IPPROTO_DCCP);
+ }
+ len=ip_hdr_len+dccp_hdr_len;
+
+ /*Send*/
+ if(parms.ip_type==AF_INET){
+ addrlen=sizeof(struct sockaddr_in);
+ }else{
+ addrlen=sizeof(struct sockaddr_in6);
+ }
+ if(sendto(socket, &buffer, len, MSG_DONTWAIT,(struct sockaddr*)parms.dest_addr.gen,addrlen)<0){
+ if(errno!=EINTR){
+ dbgprintf(0,"Error: sendto failed\n");
+ }
+ }
+ return;
+}
+
+int logPacket(int req_seq, int packet_seq){
struct request *tmp;
/*Add new request to queue*/
tmp->prev=NULL;
tmp->num_replies=0;
tmp->num_errors=0;
- tmp->seq=seq;
+ tmp->packet_seq=packet_seq;
+ tmp->request_seq=req_seq;
tmp->reply_type=UNKNOWN;
gettimeofday(&tmp->sent,NULL);
if(queue.head==NULL){
queue.head=queue.tail=tmp;
- return 0;
+ }else{
+ queue.head->prev=tmp;
+ tmp->next=queue.head;
+ queue.head=tmp;
}
- queue.head->prev=tmp;
- tmp->next=queue.head;
- queue.head=tmp;
/*Update Statistics*/
if(ping_stats.requests_sent==0){
/*Locate request*/
cur=queue.tail;
while(cur!=NULL){
- if(cur->seq==seq){
+ if(cur->packet_seq==seq){
gettimeofday(&cur->reply,NULL);
+ if(cur->num_replies>0){
+ printf("Duplicate packet detected! (%i)\n",cur->request_seq);
+ }
if(type<DEST_UNREACHABLE && type!=UNKNOWN){
cur->num_replies++;
}else{
}
if(cur==NULL){
- dbgprintf(1,"Response received but no requests sent with sequence number %i!\n", seq);
- return -1;
+ if(parms.ip_type==AF_INET && seq==-1){
+ /*IPv4 didn't include enough of the packet to get sequence numbers!*/
+ printf("%s from %s\n",response_label[type],
+ inet_ntop(parms.ip_type, (void*)&src->ipv4->sin_addr, pbuf, 1000));
+ ping_stats.errors++;
+ return 0;
+ }else{
+ dbgprintf(1,"Response received but no requests sent with sequence number %i!\n", seq);
+ return -1;
+ }
}
diff=(cur->reply.tv_usec + 1000000*cur->reply.tv_sec) - (cur->sent.tv_usec + 1000000*cur->sent.tv_sec);
/*Print Message*/
if(type<DEST_UNREACHABLE && type!=UNKNOWN){
- if(ip_type==AF_INET){
- dbgprintf(0, "Response from %s : seq=%i time=%.1fms status=%s\n",
- inet_ntop(ip_type, (void*)&src->ipv4->sin_addr, pbuf, 1000),
- seq, diff,response_label[type]);
+ if(parms.ip_type==AF_INET){
+ printf( "Response from %s : seq=%i time=%.1fms status=%s\n",
+ inet_ntop(parms.ip_type, (void*)&src->ipv4->sin_addr, pbuf, 1000),
+ cur->request_seq, diff,response_label[type]);
}else{
- dbgprintf(0, "Response from %s : seq=%i time=%.1fms status=%s\n",
- inet_ntop(ip_type, (void*)&src->ipv6->sin6_addr, pbuf, 1000),
- seq, diff,response_label[type]);
+ printf("Response from %s : seq=%i time=%.1fms status=%s\n",
+ inet_ntop(parms.ip_type, (void*)&src->ipv6->sin6_addr, pbuf, 1000),
+ cur->request_seq, diff,response_label[type]);
}
}else{
- if(ip_type==AF_INET){
- dbgprintf(0, "%s from %s : seq=%i\n",response_label[type],
- inet_ntop(ip_type, (void*)&src->ipv4->sin_addr, pbuf, 1000),
- seq);
+ if(parms.ip_type==AF_INET){
+ printf("%s from %s : seq=%i\n",response_label[type],
+ inet_ntop(parms.ip_type, (void*)&src->ipv4->sin_addr, pbuf, 1000),
+ cur->request_seq);
}else{
- dbgprintf(0, "%s from %s : seq=%i\n",response_label[type],
- inet_ntop(ip_type, (void*)&src->ipv6->sin6_addr, pbuf, 1000),
- seq);
+ printf("%s from %s : seq=%i\n",response_label[type],
+ inet_ntop(parms.ip_type, (void*)&src->ipv6->sin6_addr, pbuf, 1000),
+ cur->request_seq);
}
}
/*Update statistics*/
if(type<DEST_UNREACHABLE && type!=UNKNOWN){
/*Good Response*/
- ping_stats.rtt_avg=((ping_stats.replies_received*ping_stats.rtt_avg)+(diff))/(ping_stats.replies_received+1);
- ping_stats.replies_received++;
- if(diff < ping_stats.rtt_min){
+ if(cur->num_replies==1){
+ ping_stats.rtt_avg=((ping_stats.replies_received*ping_stats.rtt_avg)+(diff))/(ping_stats.replies_received+1);
+ ping_stats.replies_received++;
+ }else{
+ ping_stats.errors++;
+ }
+ if(diff < ping_stats.rtt_min || ping_stats.rtt_min==0){
ping_stats.rtt_min=diff;
}
if(diff > ping_stats.rtt_max){
}
}else{
/*Error*/
- cur->num_errors++;
+ ping_stats.errors++;
}
gettimeofday(&ping_stats.stop,NULL);
return 0;
}
+void clearQueue(){
+ struct request *cur;
+ struct request *tmp;
+
+ cur=queue.head;
+ while(cur!=NULL){
+ tmp=cur;
+ cur=cur->next;
+ free(tmp);
+ }
+ queue.head=NULL;
+ queue.tail=NULL;
+ return;
+}
+
+void sigHandler(){
+ char pbuf[1000];
+ int diff;
+ double ploss;
+
+ /*Print Stats*/
+ gettimeofday(&ping_stats.stop,NULL);
+ if(parms.ip_type==AF_INET){
+ printf("-----------%s PING STATISTICS-----------\n",
+ inet_ntop(parms.ip_type, (void*)&parms.dest_addr.ipv4->sin_addr, pbuf, 1000));
+ }else if(parms.ip_type==AF_INET6){
+ printf("-----------%s PING STATISTICS-----------\n",
+ inet_ntop(parms.ip_type, (void*)&parms.dest_addr.ipv6->sin6_addr, pbuf, 1000));
+ }
+ diff=(ping_stats.stop.tv_usec + 1000000*ping_stats.stop.tv_sec) -
+ (ping_stats.start.tv_usec + 1000000*ping_stats.start.tv_sec);
+ diff=diff/1000.0;
+ ploss=(1.0*(ping_stats.requests_sent-ping_stats.replies_received)/ping_stats.requests_sent*1.0)*100;
+ printf("%i packets transmitted, %i received, %i errors, %.2f%% loss, time %ims\n",
+ ping_stats.requests_sent,ping_stats.replies_received,ping_stats.errors,
+ ploss,diff);
+ printf("rtt min/avg/max = %.1f/%.1f/%.1f ms\n",
+ ping_stats.rtt_min,ping_stats.rtt_avg,ping_stats.rtt_max);
+
+
+ /*Exit Quickly*/
+ parms.count=0;
+}
+
/*Usage information for program*/
void usage()
{