[Sumover-dev] [svn commit] r4073 - vic/branches/mpeg4/net

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Wed Jun 20 15:08:13 2007
New Revision: 4073

Modified:
   vic/branches/mpeg4/net/net-ip.cpp

Log:
Added code from AG3 to: "Try to match source port to dest port before using ephemeral source port"
Revision 1.3.2.1 AG cvs
- also includes tcl reesource: noMulticastBind to stop multicast join - s no traffic will be recieved - only sent. (to enable thos option set it to true).


Modified: vic/branches/mpeg4/net/net-ip.cpp
==============================================================================
--- vic/branches/mpeg4/net/net-ip.cpp	(original)
+++ vic/branches/mpeg4/net/net-ip.cpp	Wed Jun 20 15:08:13 2007
@@ -254,8 +254,7 @@
 	(IPAddress&)local_ = local.sin_addr;
 	rsock_ = openrsock(g_addr_, s_addr_ssm_, port, local_);
 	if (rsock_ < 0) {
-		(void)::close(ssock_);
-		return (-1);
+		rsock_ = ssock_;
 	}
 
 	lport_ = local.sin_port;
@@ -360,6 +359,27 @@
 				exit(1);
 			}
 		}
+/* See if the noMulticastBind flag is set */
+
+		Tcl tcl = Tcl::instance();
+		const char *noBindStr;
+		int noBind = 0;
+
+		if ((noBindStr = tcl.attr("noMulticastBind")) != NULL)
+		{
+			noBind = (strcasecmp(noBindStr, "true") == 0);
+		}
+		/* 
+		 * XXX This is bogus multicast setup that really
+		 * shouldn't have to be done (group membership should be
+		 * implicit in the IP class D address, route should contain
+		 * ttl & no loopback flag, etc.).  Steve Deering has promised
+		 * to fix this for the 4.4bsd release.  We're all waiting
+		 * with bated breath.
+		 */
+
+		if (!noBind)
+		{
 		/* SSM code */
 #ifdef IP_ADD_SOURCE_MEMBERSHIP  
         struct ip_mreq_source mrs;
@@ -395,6 +415,7 @@
 					exit(1);
 				}
 		}
+		}
 	} else
 #endif /* IP_ADD_MEMBERSHIP */
 	{
@@ -406,7 +427,8 @@
 		sin.sin_addr.s_addr = locali;
 		if (bind(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 			perror("bind");
-			exit(1);
+            ::close(fd);
+            return (-1);
 		}
 		/*
 		 * Despite several attempts on our part to get this fixed,
@@ -455,17 +477,26 @@
 	}
 	nonblock(fd);
 
+        if (IN_CLASSD(ntohl(addri))) {
+                int on = 1;
+                if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on,
+                                sizeof(on)) < 0) {
+                        perror("SO_REUSEADDR");
+                }
+        }
 
-#ifdef WIN32
 	memset((char *)&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
-	sin.sin_port = 0;
+	sin.sin_port = port;
 	sin.sin_addr.s_addr = INADDR_ANY;
 	if (bind(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-		perror("bind");
-		exit(1);
+        sin.sin_port = 0;
+        if (bind(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+            perror("bind");
+            exit(1);
+        }
 	}
-#endif
+
 	memset((char *)&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
 	sin.sin_port = port;