Attachment 138995 Details for Bug 185148 – remove_unnecessary_else_clause_nesting.patch.txt

remove_unnecessary_else_clause_nesting.patch.txt

remove_unnecessary_else_clause_nesting.patch.txt (text/plain), 9.57 KB, created by sdietric on 2013-12-23 22:11:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sdietric

Created: 2013-12-23 22:11:03 UTC

Size: 9.57 KB

patch

obsolete

>Index: ip6_mroute.c
>===================================================================
>--- ip6_mroute.c	(revision 259790)
>+++ ip6_mroute.c	(working copy)
>@@ -1130,206 +1130,206 @@
> 	if (rt) {
> 		MFC6_UNLOCK();
> 		return (ip6_mdq(m, ifp, rt));
>-	} else {
>-		/*
>-		 * If we don't have a route for packet's origin,
>-		 * Make a copy of the packet &
>-		 * send message to routing daemon
>-		 */
>+	}
> 
>-		struct mbuf *mb0;
>-		struct rtdetq *rte;
>-		u_long hash;
>-/*		int i, npkts;*/
>+	/*
>+	 * If we don't have a route for packet's origin,
>+	 * Make a copy of the packet &
>+	 * send message to routing daemon
>+	 */
>+
>+	struct mbuf *mb0;
>+	struct rtdetq *rte;
>+	u_long hash;
>+/*	int i, npkts;*/
> #ifdef UPCALL_TIMING
>-		struct timeval tp;
>+	struct timeval tp;
> 
>-		GET_TIME(tp);
>+	GET_TIME(tp);
> #endif /* UPCALL_TIMING */
> 
>-		MRT6STAT_INC(mrt6s_no_route);
>+	MRT6STAT_INC(mrt6s_no_route);
> #ifdef MRT6DEBUG
>-		if (V_mrt6debug & (DEBUG_FORWARD | DEBUG_MFC))
>-			log(LOG_DEBUG, "ip6_mforward: no rte s %s g %s\n",
>-			    ip6_sprintf(ip6bufs, &ip6->ip6_src),
>-			    ip6_sprintf(ip6bufd, &ip6->ip6_dst));
>+	if (V_mrt6debug & (DEBUG_FORWARD | DEBUG_MFC))
>+		log(LOG_DEBUG, "ip6_mforward: no rte s %s g %s\n",
>+		    ip6_sprintf(ip6bufs, &ip6->ip6_src),
>+		    ip6_sprintf(ip6bufd, &ip6->ip6_dst));
> #endif
> 
>-		/*
>-		 * Allocate mbufs early so that we don't do extra work if we
>-		 * are just going to fail anyway.
>-		 */
>-		rte = (struct rtdetq *)malloc(sizeof(*rte), M_MRTABLE6,
>-					      M_NOWAIT);
>-		if (rte == NULL) {
>+	/*
>+	 * Allocate mbufs early so that we don't do extra work if we
>+	 * are just going to fail anyway.
>+	 */
>+	rte = (struct rtdetq *)malloc(sizeof(*rte), M_MRTABLE6,
>+				      M_NOWAIT);
>+	if (rte == NULL) {
>+		MFC6_UNLOCK();
>+		return (ENOBUFS);
>+	}
>+	mb0 = m_copy(m, 0, M_COPYALL);
>+	/*
>+	 * Pullup packet header if needed before storing it,
>+	 * as other references may modify it in the meantime.
>+	 */
>+	if (mb0 &&
>+	    (M_HASCL(mb0) || mb0->m_len < sizeof(struct ip6_hdr)))
>+		mb0 = m_pullup(mb0, sizeof(struct ip6_hdr));
>+	if (mb0 == NULL) {
>+		free(rte, M_MRTABLE6);
>+		MFC6_UNLOCK();
>+		return (ENOBUFS);
>+	}
>+
>+	/* is there an upcall waiting for this packet? */
>+	hash = MF6CHASH(ip6->ip6_src, ip6->ip6_dst);
>+	for (rt = mf6ctable[hash]; rt; rt = rt->mf6c_next) {
>+		if (IN6_ARE_ADDR_EQUAL(&ip6->ip6_src,
>+				       &rt->mf6c_origin.sin6_addr) &&
>+		    IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
>+				       &rt->mf6c_mcastgrp.sin6_addr) &&
>+		    (rt->mf6c_stall != NULL))
>+			break;
>+	}
>+
>+	if (rt == NULL) {
>+		struct mrt6msg *im;
>+#ifdef MRT6_OINIT
>+		struct omrt6msg *oim;
>+#endif
>+
>+		/* no upcall, so make a new entry */
>+		rt = (struct mf6c *)malloc(sizeof(*rt), M_MRTABLE6,
>+					  M_NOWAIT);
>+		if (rt == NULL) {
>+			free(rte, M_MRTABLE6);
>+			m_freem(mb0);
> 			MFC6_UNLOCK();
> 			return (ENOBUFS);
> 		}
>-		mb0 = m_copy(m, 0, M_COPYALL);
> 		/*
>-		 * Pullup packet header if needed before storing it,
>-		 * as other references may modify it in the meantime.
>+		 * Make a copy of the header to send to the user
>+		 * level process
> 		 */
>-		if (mb0 &&
>-		    (M_HASCL(mb0) || mb0->m_len < sizeof(struct ip6_hdr)))
>-			mb0 = m_pullup(mb0, sizeof(struct ip6_hdr));
>-		if (mb0 == NULL) {
>+		mm = m_copy(mb0, 0, sizeof(struct ip6_hdr));
>+
>+		if (mm == NULL) {
> 			free(rte, M_MRTABLE6);
>+			m_freem(mb0);
>+			free(rt, M_MRTABLE6);
> 			MFC6_UNLOCK();
> 			return (ENOBUFS);
> 		}
> 
>-		/* is there an upcall waiting for this packet? */
>-		hash = MF6CHASH(ip6->ip6_src, ip6->ip6_dst);
>-		for (rt = mf6ctable[hash]; rt; rt = rt->mf6c_next) {
>-			if (IN6_ARE_ADDR_EQUAL(&ip6->ip6_src,
>-					       &rt->mf6c_origin.sin6_addr) &&
>-			    IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst,
>-					       &rt->mf6c_mcastgrp.sin6_addr) &&
>-			    (rt->mf6c_stall != NULL))
>-				break;
>-		}
>+		/*
>+		 * Send message to routing daemon
>+		 */
>+		sin6.sin6_addr = ip6->ip6_src;
> 
>-		if (rt == NULL) {
>-			struct mrt6msg *im;
>+		im = NULL;
> #ifdef MRT6_OINIT
>-			struct omrt6msg *oim;
>+		oim = NULL;
> #endif
>-
>-			/* no upcall, so make a new entry */
>-			rt = (struct mf6c *)malloc(sizeof(*rt), M_MRTABLE6,
>-						  M_NOWAIT);
>-			if (rt == NULL) {
>-				free(rte, M_MRTABLE6);
>-				m_freem(mb0);
>-				MFC6_UNLOCK();
>-				return (ENOBUFS);
>-			}
>-			/*
>-			 * Make a copy of the header to send to the user
>-			 * level process
>-			 */
>-			mm = m_copy(mb0, 0, sizeof(struct ip6_hdr));
>-
>-			if (mm == NULL) {
>-				free(rte, M_MRTABLE6);
>-				m_freem(mb0);
>-				free(rt, M_MRTABLE6);
>-				MFC6_UNLOCK();
>-				return (ENOBUFS);
>-			}
>-
>-			/*
>-			 * Send message to routing daemon
>-			 */
>-			sin6.sin6_addr = ip6->ip6_src;
>-
>-			im = NULL;
>+		switch (V_ip6_mrouter_ver) {
> #ifdef MRT6_OINIT
>-			oim = NULL;
>+		case MRT6_OINIT:
>+			oim = mtod(mm, struct omrt6msg *);
>+			oim->im6_msgtype = MRT6MSG_NOCACHE;
>+			oim->im6_mbz = 0;
>+			break;
> #endif
>-			switch (V_ip6_mrouter_ver) {
>-#ifdef MRT6_OINIT
>-			case MRT6_OINIT:
>-				oim = mtod(mm, struct omrt6msg *);
>-				oim->im6_msgtype = MRT6MSG_NOCACHE;
>-				oim->im6_mbz = 0;
>-				break;
>-#endif
>-			case MRT6_INIT:
>-				im = mtod(mm, struct mrt6msg *);
>-				im->im6_msgtype = MRT6MSG_NOCACHE;
>-				im->im6_mbz = 0;
>-				break;
>-			default:
>-				free(rte, M_MRTABLE6);
>-				m_freem(mb0);
>-				free(rt, M_MRTABLE6);
>-				MFC6_UNLOCK();
>-				return (EINVAL);
>-			}
>+		case MRT6_INIT:
>+			im = mtod(mm, struct mrt6msg *);
>+			im->im6_msgtype = MRT6MSG_NOCACHE;
>+			im->im6_mbz = 0;
>+			break;
>+		default:
>+			free(rte, M_MRTABLE6);
>+			m_freem(mb0);
>+			free(rt, M_MRTABLE6);
>+			MFC6_UNLOCK();
>+			return (EINVAL);
>+		}
> 
> #ifdef MRT6DEBUG
>-			if (V_mrt6debug & DEBUG_FORWARD)
>-				log(LOG_DEBUG,
>-				    "getting the iif info in the kernel\n");
>+		if (V_mrt6debug & DEBUG_FORWARD)
>+			log(LOG_DEBUG,
>+			    "getting the iif info in the kernel\n");
> #endif
> 
>-			for (mifp = mif6table, mifi = 0;
>-			     mifi < nummifs && mifp->m6_ifp != ifp;
>-			     mifp++, mifi++)
>-				;
>+		for (mifp = mif6table, mifi = 0;
>+		     mifi < nummifs && mifp->m6_ifp != ifp;
>+		     mifp++, mifi++)
>+			;
> 
>-			switch (V_ip6_mrouter_ver) {
>+		switch (V_ip6_mrouter_ver) {
> #ifdef MRT6_OINIT
>-			case MRT6_OINIT:
>-				oim->im6_mif = mifi;
>-				break;
>+		case MRT6_OINIT:
>+			oim->im6_mif = mifi;
>+			break;
> #endif
>-			case MRT6_INIT:
>-				im->im6_mif = mifi;
>-				break;
>-			}
>+		case MRT6_INIT:
>+			im->im6_mif = mifi;
>+			break;
>+		}
> 
>-			if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
>-				log(LOG_WARNING, "ip6_mforward: ip6_mrouter "
>-				    "socket queue full\n");
>-				MRT6STAT_INC(mrt6s_upq_sockfull);
>+		if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) {
>+			log(LOG_WARNING, "ip6_mforward: ip6_mrouter "
>+			    "socket queue full\n");
>+			MRT6STAT_INC(mrt6s_upq_sockfull);
>+			free(rte, M_MRTABLE6);
>+			m_freem(mb0);
>+			free(rt, M_MRTABLE6);
>+			MFC6_UNLOCK();
>+			return (ENOBUFS);
>+		}
>+
>+		MRT6STAT_INC(mrt6s_upcalls);
>+
>+		/* insert new entry at head of hash chain */
>+		bzero(rt, sizeof(*rt));
>+		rt->mf6c_origin.sin6_family = AF_INET6;
>+		rt->mf6c_origin.sin6_len = sizeof(struct sockaddr_in6);
>+		rt->mf6c_origin.sin6_addr = ip6->ip6_src;
>+		rt->mf6c_mcastgrp.sin6_family = AF_INET6;
>+		rt->mf6c_mcastgrp.sin6_len = sizeof(struct sockaddr_in6);
>+		rt->mf6c_mcastgrp.sin6_addr = ip6->ip6_dst;
>+		rt->mf6c_expire = UPCALL_EXPIRE;
>+		n6expire[hash]++;
>+		rt->mf6c_parent = MF6C_INCOMPLETE_PARENT;
>+
>+		/* link into table */
>+		rt->mf6c_next  = mf6ctable[hash];
>+		mf6ctable[hash] = rt;
>+		/* Add this entry to the end of the queue */
>+		rt->mf6c_stall = rte;
>+	} else {
>+		/* determine if q has overflowed */
>+		struct rtdetq **p;
>+		int npkts = 0;
>+
>+		for (p = &rt->mf6c_stall; *p != NULL; p = &(*p)->next)
>+			if (++npkts > MAX_UPQ6) {
>+				MRT6STAT_INC(mrt6s_upq_ovflw);
> 				free(rte, M_MRTABLE6);
> 				m_freem(mb0);
>-				free(rt, M_MRTABLE6);
> 				MFC6_UNLOCK();
>-				return (ENOBUFS);
>+				return (0);
> 			}
> 
>-			MRT6STAT_INC(mrt6s_upcalls);
>+		/* Add this entry to the end of the queue */
>+		*p = rte;
>+	}
> 
>-			/* insert new entry at head of hash chain */
>-			bzero(rt, sizeof(*rt));
>-			rt->mf6c_origin.sin6_family = AF_INET6;
>-			rt->mf6c_origin.sin6_len = sizeof(struct sockaddr_in6);
>-			rt->mf6c_origin.sin6_addr = ip6->ip6_src;
>-			rt->mf6c_mcastgrp.sin6_family = AF_INET6;
>-			rt->mf6c_mcastgrp.sin6_len = sizeof(struct sockaddr_in6);
>-			rt->mf6c_mcastgrp.sin6_addr = ip6->ip6_dst;
>-			rt->mf6c_expire = UPCALL_EXPIRE;
>-			n6expire[hash]++;
>-			rt->mf6c_parent = MF6C_INCOMPLETE_PARENT;
>-
>-			/* link into table */
>-			rt->mf6c_next  = mf6ctable[hash];
>-			mf6ctable[hash] = rt;
>-			/* Add this entry to the end of the queue */
>-			rt->mf6c_stall = rte;
>-		} else {
>-			/* determine if q has overflowed */
>-			struct rtdetq **p;
>-			int npkts = 0;
>-
>-			for (p = &rt->mf6c_stall; *p != NULL; p = &(*p)->next)
>-				if (++npkts > MAX_UPQ6) {
>-					MRT6STAT_INC(mrt6s_upq_ovflw);
>-					free(rte, M_MRTABLE6);
>-					m_freem(mb0);
>-					MFC6_UNLOCK();
>-					return (0);
>-				}
>-
>-			/* Add this entry to the end of the queue */
>-			*p = rte;
>-		}
>-
>-		rte->next = NULL;
>-		rte->m = mb0;
>-		rte->ifp = ifp;
>+	rte->next = NULL;
>+	rte->m = mb0;
>+	rte->ifp = ifp;
> #ifdef UPCALL_TIMING
>-		rte->t = tp;
>+	rte->t = tp;
> #endif /* UPCALL_TIMING */
> 
>-		MFC6_UNLOCK();
>+	MFC6_UNLOCK();
> 
>-		return (0);
>-	}
>+	return (0);
> }
> 
> /*
>Index: ip6_mroute.h
>===================================================================
>--- ip6_mroute.h	(revision 259790)
>+++ ip6_mroute.h	(working copy)
>@@ -145,11 +145,6 @@
> struct omrt6msg {
> 	u_long	    unused1;
> 	u_char	    im6_msgtype;		/* what type of message	    */
>-#if 0
>-#define MRT6MSG_NOCACHE	1
>-#define MRT6MSG_WRONGMIF	2
>-#define MRT6MSG_WHOLEPKT	3		/* used for user level encap*/
>-#endif
> 	u_char	    im6_mbz;			/* must be zero		    */
> 	u_char	    im6_mif;			/* mif rec'd on		    */
> 	u_char	    unused2;

Actions: View

Attachments on bug 185148: 138994 | 138995 | 138996