xnu-792.17.14.tar.gz

[apple/xnu.git] / bsd / netat / ddp_rtmptable.c

diff --git a/bsd/netat/ddp_rtmptable.c b/bsd/netat/ddp_rtmptable.c
index a197b7d6c30c3291dd55a70d0a8c0a46b68b625a..81eb400ef78e491ddeaff7dc98a4d5e3ef86e369 100644 (file)
--- a/bsd/netat/ddp_rtmptable.c
+++ b/bsd/netat/ddp_rtmptable.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*----------------------------------------------------------------------------
  *
@@ -880,6 +886,14 @@ void routing_needed(mp, ifID, bypass)
 
                /* somehow, come to that point... */
 
+               /* if multihomed - need to set source address to the interface
+                * the packet is being sent from.
+                */
+               if (MULTIHOME_MODE) {
+                       NET_ASSIGN(ddp->src_net, ifID_table[Entry->NetPort]->ifThisNode.s_net);
+                       ddp->src_node = ifID_table[Entry->NetPort]->ifThisNode.s_node;
+               }
+
                ifID->ifStatistics.fwdPkts++;
                ifID->ifStatistics.fwdBytes += msgsize;
 
@@ -1108,8 +1122,8 @@ void getIfUsage(zone, ifs_in_zone)
      int zone;
      at_ifnames_t *ifs_in_zone;
 
-/* sets a "1" in each element of the char array for each I/F in the
-   requested zone. The char array has a 1:1 correspondence with the
+/* sets the interface name in each element of the array for each I/F in the
+   requested zone. The array has a 1:1 correspondence with the
    ifID_table. Zone is assumed to be valid and local, so if we're in
    single port mode, we'll set the home port and thats it.
 */
@@ -1121,7 +1135,7 @@ void getIfUsage(zone, ifs_in_zone)
        at_ifaddr_t     *ifID;
 
        if (!MULTIPORT_MODE) {
-               strncpy(ifs_in_zone->at_if[cnt], ifID_home->ifName, 
+               strlcpy(ifs_in_zone->at_if[cnt], ifID_home->ifName, 
                        IFNAMESIZ);
                return;
        }
@@ -1136,7 +1150,7 @@ void getIfUsage(zone, ifs_in_zone)
                if (route->ZoneBitMap[zmi] & zmb) {
                        dPrintf(D_M_NBP_LOW, D_L_USR3, ("zone in port %d \n",
                                route->NetPort));
-                       strncpy(ifs_in_zone->at_if[cnt], 
+                       strlcpy(ifs_in_zone->at_if[cnt], 
                                ifID_table[route->NetPort]->ifName, IFNAMESIZ);
                        cnt++;
                }