Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Mar 2004 21:10:46 -0800 (PST)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 49510 for review
Message-ID:  <200403220510.i2M5AkJh022371@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49510

Change 49510 by rwatson@rwatson_paprika on 2004/03/21 21:10:15

	Integ ntperf_socket:
	
	- loop back rename of if_addr to if_addr_list
	- loop back rename of ddpcb to ddpcb_list

Affected files ...

.. //depot/projects/netperf_socket/sys/netatalk/aarp.c#5 integrate
.. //depot/projects/netperf_socket/sys/netatalk/at_control.c#5 integrate
.. //depot/projects/netperf_socket/sys/netatalk/at_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#4 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_output.c#4 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#5 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#8 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#3 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/netatalk/aarp.c#5 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
- * $FreeBSD: src/sys/netatalk/aarp.c,v 1.27 2004/03/22 03:57:01 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/aarp.c,v 1.28 2004/03/22 04:50:36 rwatson Exp $
  */
 
 #include "opt_atalk.h"
@@ -106,7 +106,7 @@
     struct at_ifaddr	*aa;
     struct sockaddr_at	*sat2;
 
-	for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 		sat2 = &(aa->aa_addr);
 		if (sat2->sat_addr.s_net == sat->sat_addr.s_net) {
 	    		break;

==== //depot/projects/netperf_socket/sys/netatalk/at_control.c#5 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
- * $FreeBSD: src/sys/netatalk/at_control.c,v 1.38 2004/03/22 03:57:01 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/at_control.c,v 1.39 2004/03/22 04:50:36 rwatson Exp $
  */
 
 #include <sys/param.h>
@@ -21,7 +21,7 @@
 #include <netatalk/at_var.h>
 #include <netatalk/at_extern.h>
 
-struct at_ifaddr	*at_ifaddr;
+struct at_ifaddr	*at_ifaddr_list;
 
 static int aa_dorangeroute(struct ifaddr *ifa,
 			u_int first, u_int last, int cmd);
@@ -57,7 +57,7 @@
      * If we have an ifp, then find the matching at_ifaddr if it exists
      */
     if (ifp != NULL) {
-	for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 	    if (aa->aa_ifp == ifp) break;
 	}
     }
@@ -139,7 +139,7 @@
 	 */
 	if (aa == NULL) {
 	    aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO);
-	    if ((aa = at_ifaddr) != NULL) {
+	    if ((aa = at_ifaddr_list) != NULL) {
 		/*
 		 * Don't let the loopback be first, since the first
 		 * address is the machine's default address for
@@ -147,17 +147,17 @@
 		 * If it is, stick ourself in front, otherwise
 		 * go to the back of the list.
 		 */
-		if (at_ifaddr->aa_ifp->if_flags & IFF_LOOPBACK) {
+		if (at_ifaddr_list->aa_ifp->if_flags & IFF_LOOPBACK) {
 		    aa = aa0;
-		    aa->aa_next = at_ifaddr;
-		    at_ifaddr = aa;
+		    aa->aa_next = at_ifaddr_list;
+		    at_ifaddr_list = aa;
 		} else {
 		    for (; aa->aa_next; aa = aa->aa_next)
 			;
 		    aa->aa_next = aa0;
 		}
 	    } else {
-		at_ifaddr = aa0;
+		at_ifaddr_list = aa0;
 	    }
 	    aa = aa0;
 
@@ -277,8 +277,8 @@
 	 * as well, or we'd be in deep trouble
 	 */
 	aa0 = aa;
-	if (aa0 == (aa = at_ifaddr)) {
-	    at_ifaddr = aa->aa_next;
+	if (aa0 == (aa = at_ifaddr_list)) {
+	    at_ifaddr_list = aa->aa_next;
 	} else {
 	    while (aa->aa_next && (aa->aa_next != aa0)) {
 		aa = aa->aa_next;
@@ -670,7 +670,7 @@
     /*
      * failing that, if the net is one we have, it's a broadcast as well.
      */
-    for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+    for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 	if ((aa->aa_ifp->if_flags & IFF_BROADCAST)
 	 && (ntohs(sat->sat_addr.s_net) >= ntohs(aa->aa_firstnet)
 	 && ntohs(sat->sat_addr.s_net) <= ntohs(aa->aa_lastnet))) {
@@ -801,10 +801,10 @@
     struct ifaddr	*ifa;
     struct ifnet	*ifp;
 
-    while (aa = at_ifaddr) {
+    while ((aa = at_ifaddr_list) != NULL) {
 	ifp = aa->aa_ifp;
 	at_scrub(ifp, aa);
-	at_ifaddr = aa->aa_next;
+	at_ifaddr_list = aa->aa_next;
 	if ((ifa = ifp->if_addrlist) == (struct ifaddr *)aa) {
 	    ifp->if_addrlist = ifa->ifa_next;
 	} else {

==== //depot/projects/netperf_socket/sys/netatalk/at_var.h#2 (text+ko) ====

@@ -20,7 +20,7 @@
  *	+1-313-763-0525
  *	netatalk@itd.umich.edu
  *
- * $FreeBSD: src/sys/netatalk/at_var.h,v 1.11 2003/03/04 23:19:51 jlemon Exp $
+ * $FreeBSD: src/sys/netatalk/at_var.h,v 1.12 2004/03/22 04:50:36 rwatson Exp $
  */
 
 #ifndef _NETATALK_AT_VAR_H_
@@ -60,7 +60,7 @@
 #define AFA_PHASE2	0x0004
 
 #ifdef _KERNEL
-extern struct at_ifaddr	*at_ifaddr;
+extern struct at_ifaddr	*at_ifaddr_list;
 #endif
 
 #endif /* _NETATALK_AT_VAR_H_ */

==== //depot/projects/netperf_socket/sys/netatalk/ddp_input.c#4 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.22 2004/03/22 03:57:01 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.23 2004/03/22 04:50:36 rwatson Exp $
  */
 
 #include "opt_mac.h"
@@ -126,7 +126,7 @@
 	 * Make sure that we point to the phase1 ifaddr info 
 	 * and that it's valid for this packet.
 	 */
-	for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 	    if ((aa->aa_ifp == ifp)
 	    && ((aa->aa_flags & AFA_PHASE2) == 0)
 	    && ((to.sat_addr.s_node == AA_SAT(aa)->sat_addr.s_node)
@@ -185,7 +185,7 @@
 	     * this node number will match (which may NOT be what we want,
 	     * but it's probably safe in 99.999% of cases.
 	     */
-	    for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	    for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 		if (phase == 1 && (aa->aa_flags & AFA_PHASE2)) {
 		    continue;
 		}
@@ -204,7 +204,7 @@
 	     * A destination network was given. We just try to find 
 	     * which ifaddr info matches it.
 	     */
-	    for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	    for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 		/*
 		 * This is a kludge. Accept packets that are
 		 * for any router on a local netrange.

==== //depot/projects/netperf_socket/sys/netatalk/ddp_output.c#4 (text+ko) ====

@@ -21,7 +21,7 @@
  *	netatalk@itd.umich.edu
  */
 
-/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.22 2004/03/22 03:24:10 rwatson Exp $ */
+/* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.23 2004/03/22 04:50:36 rwatson Exp $ */
 
 #include "opt_mac.h"
 
@@ -149,7 +149,7 @@
     && (ro->ro_rt->rt_ifa)
     && (ifp = ro->ro_rt->rt_ifa->ifa_ifp)) {
 	net = ntohs(satosat(ro->ro_rt->rt_gateway)->sat_addr.s_net);
-	for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 	    if (((net == 0) || (aa->aa_ifp == ifp)) &&
 		    net >= ntohs(aa->aa_firstnet) &&
 		    net <= ntohs(aa->aa_lastnet)) {

==== //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#5 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.40 2004/03/22 03:57:01 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.42 2004/03/22 04:54:36 rwatson Exp $
  */
 
 #include <sys/param.h>
@@ -23,7 +23,7 @@
 #include <netatalk/at_extern.h>
 
 static struct ddpcb	*ddp_ports[ ATPORT_LAST ];
-struct ddpcb	*ddpcb = NULL;
+struct ddpcb	*ddpcb_list = NULL;
 
 void
 at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr)
@@ -50,7 +50,7 @@
 
 	if (sat->sat_addr.s_node != ATADDR_ANYNODE ||
 		sat->sat_addr.s_net != ATADDR_ANYNET) {
-	    for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	    for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 		if ((sat->sat_addr.s_net == AA_SAT(aa)->sat_addr.s_net) &&
 		 (sat->sat_addr.s_node == AA_SAT(aa)->sat_addr.s_node)) {
 		    break;
@@ -82,10 +82,10 @@
 
     if (sat->sat_addr.s_node == ATADDR_ANYNODE &&
 	    sat->sat_addr.s_net == ATADDR_ANYNET) {
-	if (at_ifaddr == NULL) {
+	if (at_ifaddr_list == NULL) {
 	    return (EADDRNOTAVAIL);
 	}
-	sat->sat_addr = AA_SAT(at_ifaddr)->sat_addr;
+	sat->sat_addr = AA_SAT(at_ifaddr_list)->sat_addr;
     }
     ddp->ddp_lsat = *sat;
 
@@ -165,7 +165,7 @@
 	}
 	aa = NULL;
 	if ((ifp = ro->ro_rt->rt_ifp) != NULL) {
-	    for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	    for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 		if (aa->aa_ifp == ifp &&
 			ntohs(net) >= ntohs(aa->aa_firstnet) &&
 			ntohs(net) <= ntohs(aa->aa_lastnet)) {
@@ -202,7 +202,7 @@
      */
     aa = NULL;
     if (ro->ro_rt && (ifp = ro->ro_rt->rt_ifp)) {
-	for (aa = at_ifaddr; aa; aa = aa->aa_next) {
+	for (aa = at_ifaddr_list; aa != NULL; aa = aa->aa_next) {
 	    if (aa->aa_ifp == ifp) {
 		break;
 	    }
@@ -235,14 +235,14 @@
 	MALLOC(ddp, struct ddpcb *, sizeof *ddp, M_PCB, M_WAITOK | M_ZERO);
 	ddp->ddp_lsat.sat_port = ATADDR_ANYPORT;
 
-	ddp->ddp_next = ddpcb;
+	ddp->ddp_next = ddpcb_list;
 	ddp->ddp_prev = NULL;
 	ddp->ddp_pprev = NULL;
 	ddp->ddp_pnext = NULL;
-	if (ddpcb != NULL) {
-		ddpcb->ddp_prev = ddp;
+	if (ddpcb_list != NULL) {
+		ddpcb_list->ddp_prev = ddp;
 	}
-	ddpcb = ddp;
+	ddpcb_list = ddp;
 
 	ddp->ddp_socket = so;
 	so->so_pcb = (caddr_t)ddp;
@@ -276,7 +276,7 @@
     if (ddp->ddp_prev) {
 	ddp->ddp_prev->ddp_next = ddp->ddp_next;
     } else {
-	ddpcb = ddp->ddp_next;
+	ddpcb_list = ddp->ddp_next;
     }
     if (ddp->ddp_next) {
 	ddp->ddp_next->ddp_prev = ddp->ddp_prev;

==== //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#8 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.38 2004/03/22 03:57:01 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.39 2004/03/22 04:54:36 rwatson Exp $
  */
 
 #include <sys/param.h>
@@ -223,7 +223,7 @@
 {
     struct ddpcb	*ddp;
 
-    for (ddp = ddpcb; ddp; ddp = ddp->ddp_next) {
+    for (ddp = ddpcb_list; ddp != NULL; ddp = ddp->ddp_next) {
 	at_pcbdetach(ddp->ddp_socket, ddp);
     }
 }

==== //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#3 (text+ko) ====

@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.5 2004/03/17 12:54:21 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/ddp_var.h,v 1.6 2004/03/22 04:54:36 rwatson Exp $
  */
 
 #ifndef _NETATALK_DDP_VAR_H_
@@ -32,7 +32,7 @@
 
 #ifdef _KERNEL
 extern int	ddp_cksum;
-extern struct ddpcb		*ddpcb;
+extern struct ddpcb		*ddpcb_list;
 extern struct pr_usrreqs	ddp_usrreqs;
 #endif
 #endif /* _NETATALK_DDP_VAR_H_ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403220510.i2M5AkJh022371>