1 files changed, 127 insertions, 36 deletions

diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index 3c27e6d38d26..5c7b73f02368 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -7,12 +7,16 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: igmp.c,v 3.8 1995/11/29 22:36:57 fenner Rel $
+ * igmp.c,v 3.8.4.19 1998/01/06 01:57:43 fenner Exp
  */
 
 
 #include "defs.h"
 
+#ifndef lint
+static char rcsid[] = "@(#) $Id: \
+igmp.c,v 3.8.4.19 1998/01/06 01:57:43 fenner Exp $";
+#endif
 
 /*
  * Exported variables.
@@ -29,7 +33,6 @@ u_int32		dvmrp_genid;		     /* IGMP generation id          */
  * Local function definitions.
  */
 /* u_char promoted to u_int */
-static char *	packet_kind __P((u_int type, u_int code));
 static int	igmp_log_level __P((u_int type, u_int code));
 
 /*
@@ -48,17 +51,23 @@ init_igmp()
 	log(LOG_ERR, errno, "IGMP socket");
 
     k_hdr_include(TRUE);	/* include IP header when sending */
-    k_set_rcvbuf(48*1024);	/* lots of input buffering        */
+    k_set_rcvbuf(256*1024,48*1024);	/* lots of input buffering        */
     k_set_ttl(1);		/* restrict multicasts to one hop */
     k_set_loop(FALSE);		/* disable multicast loopback     */
 
     ip         = (struct ip *)send_buf;
-    ip->ip_hl  = sizeof(struct ip) >> 2;
+    bzero(ip, sizeof(struct ip));
+    /*
+     * Fields zeroed that aren't filled in later:
+     * - IP ID (let the kernel fill it in)
+     * - Offset (we don't send fragments)
+     * - Checksum (let the kernel fill it in)
+     */
     ip->ip_v   = IPVERSION;
-    ip->ip_tos = 0;
-    ip->ip_off = 0;
-    ip->ip_p   = IPPROTO_IGMP;
+    ip->ip_hl  = sizeof(struct ip) >> 2;
+    ip->ip_tos = 0xc0;		/* Internet Control */
     ip->ip_ttl = MAXTTL;	/* applies to unicasts only */
+    ip->ip_p   = IPPROTO_IGMP;
 
     allhosts_group = htonl(INADDR_ALLHOSTS_GROUP);
     dvmrp_group    = htonl(INADDR_DVMRP_GROUP);
@@ -74,29 +83,33 @@ init_igmp()
 #define PIM_GRAFT        6
 #define PIM_GRAFT_ACK    7
 
-static char *
-packet_kind(type, code)
+char *
+igmp_packet_kind(type, code)
      u_int type, code;
 {
+    static char unknown[20];
+
     switch (type) {
-	case IGMP_HOST_MEMBERSHIP_QUERY:	return "membership query  ";
-	case IGMP_HOST_MEMBERSHIP_REPORT:	return "membership report ";
-	case IGMP_HOST_NEW_MEMBERSHIP_REPORT:	return "new member report ";
-	case IGMP_HOST_LEAVE_MESSAGE:           return "leave message     ";
+	case IGMP_MEMBERSHIP_QUERY:		return "membership query  ";
+	case IGMP_V1_MEMBERSHIP_REPORT:		return "V1 member report  ";
+	case IGMP_V2_MEMBERSHIP_REPORT:		return "V2 member report  ";
+	case IGMP_V2_LEAVE_GROUP:		return "leave message     ";
 	case IGMP_DVMRP:
 	  switch (code) {
-	    case DVMRP_PROBE:	    		return "neighbor probe    ";
-	    case DVMRP_REPORT:	    		return "route report      ";
-	    case DVMRP_ASK_NEIGHBORS:   	return "neighbor request  ";
-	    case DVMRP_NEIGHBORS:	    	return "neighbor list     ";
-	    case DVMRP_ASK_NEIGHBORS2:   	return "neighbor request 2";
-	    case DVMRP_NEIGHBORS2:	    	return "neighbor list 2   ";
+	    case DVMRP_PROBE:			return "neighbor probe    ";
+	    case DVMRP_REPORT:			return "route report      ";
+	    case DVMRP_ASK_NEIGHBORS:		return "neighbor request  ";
+	    case DVMRP_NEIGHBORS:		return "neighbor list     ";
+	    case DVMRP_ASK_NEIGHBORS2:		return "neighbor request 2";
+	    case DVMRP_NEIGHBORS2:		return "neighbor list 2   ";
 	    case DVMRP_PRUNE:			return "prune message     ";
 	    case DVMRP_GRAFT:			return "graft message     ";
 	    case DVMRP_GRAFT_ACK:		return "graft message ack ";
 	    case DVMRP_INFO_REQUEST:		return "info request      ";
 	    case DVMRP_INFO_REPLY:		return "info reply        ";
-	    default:	    			return "unknown DVMRP msg ";
+	    default:
+		    sprintf(unknown, "unknown DVMRP %3d ", code);
+		    return unknown;
 	  }
  	case IGMP_PIM:
  	  switch (code) {
@@ -108,11 +121,57 @@ packet_kind(type, code)
  	    case PIM_ASSERT:			return "PIM Assert        ";
  	    case PIM_GRAFT:			return "PIM Graft         ";
  	    case PIM_GRAFT_ACK:			return "PIM Graft-Ack     ";
- 	    default:		    		return "unknown PIM msg   ";
+ 	    default:
+ 		    sprintf(unknown, "unknown PIM msg%3d", code);
+		    return unknown;
  	  }
 	case IGMP_MTRACE:			return "IGMP trace query  ";
 	case IGMP_MTRACE_RESP:			return "IGMP trace reply  ";
-	default:			    	return "unknown IGMP msg  ";
+	default:
+		sprintf(unknown, "unk: 0x%02x/0x%02x    ", type, code);
+		return unknown;
+    }
+}
+
+int
+igmp_debug_kind(type, code)
+     u_int type, code;
+{
+    switch (type) {
+	case IGMP_MEMBERSHIP_QUERY:		return DEBUG_IGMP;
+	case IGMP_V1_MEMBERSHIP_REPORT:		return DEBUG_IGMP;
+	case IGMP_V2_MEMBERSHIP_REPORT:		return DEBUG_IGMP;
+	case IGMP_V2_LEAVE_GROUP:		return DEBUG_IGMP;
+	case IGMP_DVMRP:
+	  switch (code) {
+	    case DVMRP_PROBE:			return DEBUG_PEER;
+	    case DVMRP_REPORT:			return DEBUG_ROUTE;
+	    case DVMRP_ASK_NEIGHBORS:		return 0;
+	    case DVMRP_NEIGHBORS:		return 0;
+	    case DVMRP_ASK_NEIGHBORS2:		return 0;
+	    case DVMRP_NEIGHBORS2:		return 0;
+	    case DVMRP_PRUNE:			return DEBUG_PRUNE;
+	    case DVMRP_GRAFT:			return DEBUG_PRUNE;
+	    case DVMRP_GRAFT_ACK:		return DEBUG_PRUNE;
+	    case DVMRP_INFO_REQUEST:		return 0;
+	    case DVMRP_INFO_REPLY:		return 0;
+	    default:				return 0;
+	  }
+	case IGMP_PIM:
+	  switch (code) {
+	    case PIM_QUERY:			return 0;
+	    case PIM_REGISTER:			return 0;
+	    case PIM_REGISTER_STOP:		return 0;
+	    case PIM_JOIN_PRUNE:		return 0;
+	    case PIM_RP_REACHABLE:		return 0;
+	    case PIM_ASSERT:			return 0;
+	    case PIM_GRAFT:			return 0;
+	    case PIM_GRAFT_ACK:			return 0;
+	    default:				return 0;
+	  }
+	case IGMP_MTRACE:			return DEBUG_TRACE;
+	case IGMP_MTRACE_RESP:			return DEBUG_TRACE;
+	default:				return DEBUG_IGMP;
     }
 }
 
@@ -153,7 +212,11 @@ accept_igmp(recvlen)
     }
 
     iphdrlen  = ip->ip_hl << 2;
+#ifdef RAW_INPUT_IS_RAW
+    ipdatalen = ntohs(ip->ip_len) - iphdrlen;
+#else
     ipdatalen = ip->ip_len;
+#endif
     if (iphdrlen + ipdatalen != recvlen) {
 	log(LOG_WARNING, 0,
 	    "received packet from %s shorter (%u bytes) than hdr+data length (%u+%u)",
@@ -171,22 +234,23 @@ accept_igmp(recvlen)
 	return;
     }
 
+    IF_DEBUG(DEBUG_PKT|igmp_debug_kind(igmp->igmp_type, igmp->igmp_code))
     log(LOG_DEBUG, 0, "RECV %s from %-15s to %s",
-	packet_kind(igmp->igmp_type, igmp->igmp_code),
+	igmp_packet_kind(igmp->igmp_type, igmp->igmp_code),
 	inet_fmt(src, s1), inet_fmt(dst, s2));
 
     switch (igmp->igmp_type) {
 
-	case IGMP_HOST_MEMBERSHIP_QUERY:
+	case IGMP_MEMBERSHIP_QUERY:
 	    accept_membership_query(src, dst, group, igmp->igmp_code);
 	    return;
 
-	case IGMP_HOST_MEMBERSHIP_REPORT:
-	case IGMP_HOST_NEW_MEMBERSHIP_REPORT:
+	case IGMP_V1_MEMBERSHIP_REPORT:
+	case IGMP_V2_MEMBERSHIP_REPORT:
 	    accept_group_report(src, dst, group, igmp->igmp_type);
 	    return;
 	    
-	case IGMP_HOST_LEAVE_MESSAGE:
+	case IGMP_V2_LEAVE_GROUP:
 	    accept_leave_message(src, dst, group);
 	    return;
 
@@ -297,25 +361,31 @@ igmp_log_level(type, code)
 
 /*
  * Construct an IGMP message in the output packet buffer.  The caller may
- * have already placed data in that buffer, of length 'datalen'.  Then send
- * the message from the interface with IP address 'src' to destination 'dst'.
+ * have already placed data in that buffer, of length 'datalen'.
  */
 void
-send_igmp(src, dst, type, code, group, datalen)
+build_igmp(src, dst, type, code, group, datalen)
     u_int32 src, dst;
     int type, code;
     u_int32 group;
     int datalen;
 {
-    struct sockaddr_in sdst;
     struct ip *ip;
     struct igmp *igmp;
-    int setloop;
+    extern int curttl;
 
     ip                      = (struct ip *)send_buf;
     ip->ip_src.s_addr       = src;
     ip->ip_dst.s_addr       = dst;
     ip->ip_len              = MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen;
+#ifdef RAW_OUTPUT_IS_RAW
+    ip->ip_len		    = htons(ip->ip_len);
+#endif
+    if (IN_MULTICAST(ntohl(dst))) {
+	ip->ip_ttl = curttl;
+    } else {
+	ip->ip_ttl = MAXTTL;
+    }
 
     igmp                    = (struct igmp *)(send_buf + MIN_IP_HEADER_LEN);
     igmp->igmp_type         = type;
@@ -324,10 +394,28 @@ send_igmp(src, dst, type, code, group, datalen)
     igmp->igmp_cksum        = 0;
     igmp->igmp_cksum        = inet_cksum((u_short *)igmp,
 					 IGMP_MINLEN + datalen);
+}
+
+/* 
+ * Call build_igmp() to build an IGMP message in the output packet buffer.
+ * Then send the message from the interface with IP address 'src' to
+ * destination 'dst'.
+ */
+void
+send_igmp(src, dst, type, code, group, datalen)
+    u_int32 src, dst;
+    int type, code;
+    u_int32 group;
+    int datalen;
+{
+    struct sockaddr_in sdst;
+    int setloop = 0;
+
+    build_igmp(src, dst, type, code, group, datalen);
 
     if (IN_MULTICAST(ntohl(dst))) {
 	k_set_if(src);
-	if (type != IGMP_DVMRP) {
+	if (type != IGMP_DVMRP || dst == allhosts_group) {
 	    setloop = 1;
 	    k_set_loop(TRUE);
 	}
@@ -335,11 +423,12 @@ send_igmp(src, dst, type, code, group, datalen)
 
     bzero(&sdst, sizeof(sdst));
     sdst.sin_family = AF_INET;
-#if (defined(BSD) && (BSD >= 199103))
+#ifdef HAVE_SA_LEN
     sdst.sin_len = sizeof(sdst);
 #endif
     sdst.sin_addr.s_addr = dst;
-    if (sendto(igmp_socket, send_buf, ip->ip_len, 0,
+    if (sendto(igmp_socket, send_buf,
+			MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen, 0,
 			(struct sockaddr *)&sdst, sizeof(sdst)) < 0) {
 	if (errno == ENETDOWN)
 	    check_vif_state();
@@ -352,6 +441,8 @@ send_igmp(src, dst, type, code, group, datalen)
     if (setloop)
 	    k_set_loop(FALSE);
 
+    IF_DEBUG(DEBUG_PKT|igmp_debug_kind(type, code))
     log(LOG_DEBUG, 0, "SENT %s from %-15s to %s",
-	packet_kind(type, code), inet_fmt(src, s1), inet_fmt(dst, s2));
+	igmp_packet_kind(type, code), src == INADDR_ANY ? "INADDR_ANY" :
+				 inet_fmt(src, s1), inet_fmt(dst, s2));
 }