/util/udpSocket.c - Diff - PeerStreamer - Redmine

Revision 11fce711 util/udpSocket.c

     #include "udpSocket.h"
     #define LOG_MODULE "[ml] "
     #include "grapes_log.h"
     #include "ml_log.h"
     /* debug varible: set to 1 if you want debug output  */
     int verbose = 0;
-...
       //This is debug code that checks if the socket was created
       if (udpSocket == -1)
+        {
           fatal("Could not create an UDP socket!");
           fatal("Could not create an UDP socket!\n");
           exit(1);
+        }
-...
       /* This is debug code */
       if (returnStatus) {
         fatal("Could not bind socketID to address!");
         fatal("Could not bind socketID to address!\n");
+      }
     #ifdef IP_MTU_DISCOVER
-...
        * This sets the DON'T FRAGMENT bit on the IP HEADER
        */
       if(setsockopt(udpSocket,IPPROTO_IP,IP_MTU_DISCOVER,&pmtuopt ,size) == -1){
         error("setsockopt: set IP_DONTFRAG did not work. ERRNO %d",errno);
         error("setsockopt: set IP_DONTFRAG did not work. ERRNO %d\n",errno);
+      }
       /* This option writes the IP_TTL field into ancillary data */
       if(setsockopt(udpSocket,IPPROTO_IP, IP_RECVTTL, &yes,size) < 0)
+        {
           error("setsockopt: cannot set RECV_TTL. ERRNO %d",errno);
           error("setsockopt: cannot set RECV_TTL. ERRNO %d\n",errno);
+        }
       /* This option writes received internal and external(icmp) error messages into ancillary data */
       if(setsockopt(udpSocket,IPPROTO_IP, IP_RECVERR, &yes,size) < 0) {
     	error("setsockopt: cannot set RECV_ERROR. ERRNO %d",errno);
     	error("setsockopt: cannot set RECV_ERROR. ERRNO %d\n",errno);
+        }
     #endif
-...
     	unsigned int size = sizeof(value);
     	if(getsockopt(udpSocket,SOL_IP,IP_TTL,&value,&size) == -1){
     		error("get TTL did not work");
     		error("get TTL did not work\n");
     		return 0;
+    	}
     	*ttl = value;
     	if(verbose == 1) debug("TTL is %i",value);
     	if(verbose == 1) debug("TTL is %i\n",value);
     	return 1;
+    }
-...
     	ret = sendmsg(udpSocket,&msgh,0);
     	if (ret  < 0){
     		error = errno;
     		debug("ML: sendmsg failed errno %d: %s", error, strerror(error));
     		debug("ML: sendmsg failed errno %d: %s\n", error, strerror(error));
     		switch(error) {
     			case EMSGSIZE:
     				return MSGLEN;
-...
     int handleSocketError(const int udpSocket,const int iofunc,char *buf,int *bufsize,struct sockaddr_in *addr,icmp_error_cb icmpcb_value,int *ttl){
     	if(verbose == 1) debug("handle Socket error is called");
     	if(verbose == 1) debug("handle Socket error is called\n");
     	/* variables  */
     	struct msghdr msgh;
-...
     			if (errptr->ee_origin == SO_EE_ORIGIN_LOCAL){
     				if (errptr->ee_errno != EMSGSIZE) {
     					if(verbose == 1)
     						printf("local error: %s \n", strerror(errptr->ee_errno));
     						error("local error: %s \n", strerror(errptr->ee_errno));
+    				}
+    			}
     			/* check if the error originated from an icmp message  */
     			if (errptr->ee_origin == SO_EE_ORIGIN_ICMP){
     				if(verbose == 1)
     					debug("icmp error message received");
     					debug("icmp error message received\n");
     				int type = errptr->ee_type;
     				int code = errptr->ee_code;
     				icmp = 1;
     				warn("icmp error message is type: %d code %d",
     				warn("icmp error message is type: %d code %d\n",
     					errptr->ee_type,errptr->ee_code);
     				/* raise the pmtu callback when an pmtu error occurred
-...
     				if (type == 3 && code == 4){
     					if(verbose == 1)
     						debug("pmtu error message received");
     						debug("pmtu error message received\n");
     					int mtusize = *bufsize;
     					(icmpcb_value)(buf,mtusize);
-...
     	* has to be carried out
     	*/
     	//printf("socketErrorHandle: before iofunc loop \n");
     	//error("socketErrorHandle: before iofunc loop \n");
     	int transbuf;
     	memcpy(&transbuf,bufsize,4);
-...
     	if(iofunc == 1) {
     		sendPacket(udpSocket,buf,transbuf,addr,icmpcb_value);
     		if(verbose == 1)
     			printf("handle socket error: packetsize %i \n ",*bufsize );
     			error("handle socket error: packetsize %i \n ",*bufsize );
     	} else {
     		if(iofunc == 2 && icmp == 1){
     			if(verbose == 1)
     				printf("handleSOcketError: recvPacket called \n ");
     				error("handleSOcketError: recvPacket called \n ");
     			recvPacket(udpSocket,buf,bufsize,addr,icmpcb_value,ttl);
     		} else {
     		/* this is the case the socket has just an error message not related to anything of the messaging layer */
     			if(verbose == 1)
     				printf("handleSocketError: unrelated error \n");
     				error("handleSocketError: unrelated error \n");
     			*ttl = -1;
+    		}
+    	}
-...
     	/* receive the message */
     	if (returnStatus < 0) {
     		if(verbose == 1) {
     			printf("udpSocket:recvPacket: Read the error queue \n ");
     			printf("recvmsg failed. errno %d \n",errno);
     			error("udpSocket:recvPacket: Read the error queue \n ");
     			error("recvmsg failed. errno %d \n",errno);
+    		}
     		// TODO debug code: delete afterwards start
     		if(errno == 11) {
-...
     	} else {
     		/* debug code  */
     		if(verbose == 1)
     			printf("udpSocket_recvPacket: Message received.\n");
     			debug("udpSocket_recvPacket: Message received.\n");
     		for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL; cmsg = CMSG_NXTHDR(&msgh,cmsg)) {
     			if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_TTL) {
-...
     				received_ttl = *ttlptr;
     				memcpy(ttl,ttlptr,4);
     				if(verbose == 1)
     					printf("received ttl true: %i  \n ",received_ttl);
     					debug("received ttl true: %i  \n ",received_ttl);
     				break;
+    			}
+    		}

Also available in: Unified diff