xnu-344.49.tar.gz

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

diff --git a/bsd/netat/ddp_r_rtmp.c b/bsd/netat/ddp_r_rtmp.c
index 4c74b7faec328b2722d7ca8009b101361ff9ae07..a239df24b17d144e095f3d7e1782a81c3d2a0f95 100644 (file)
--- a/bsd/netat/ddp_r_rtmp.c
+++ b/bsd/netat/ddp_r_rtmp.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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@
  */
@@ -65,6 +68,8 @@
 #include <netat/aurp.h>
 #include <netat/debug.h>
 
+#include <sys/kern_event.h>
+
 extern void (*ddp_AURPsendx)();
 extern at_ifaddr_t *aurp_ifID;
 extern at_ifaddr_t *ifID_table[];
@@ -1387,7 +1392,7 @@ int rtmp_router_start(keP)
                /* set the right net and node for each port */
                Entry->NextIRNet = ifID->ifThisNode.s_net;
                Entry->NextIRNode= ifID->ifThisNode.s_node;
-
+               
                dPrintf(D_M_RTMP, D_L_STARTUP,
                        ("rtmp_router_start: bring port=%d [%d.%d]... on line\n",
                         ifID->ifPort, ifID->ifThisNode.s_net,
@@ -1430,6 +1435,12 @@ int rtmp_router_start(keP)
            != EWOULDBLOCK) {
                goto error;
        }
+       
+       /* Is the stack still up ? */
+       if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
+               err = ECONNABORTED;
+               goto error;
+       }
 
 startZoneInfo:
        err = 0;
@@ -1470,6 +1481,12 @@ startZoneInfo:
                            != EWOULDBLOCK) {
                                goto error;
                        }
+                       
+                       /* Is the stack still up ? */
+                       if (!(at_state.flags & AT_ST_STARTED) || !ifID_home) {
+                               err = ECONNABORTED;
+                               goto error;
+                       }
 
                        err = 0;
                        router_starting_timer++;
@@ -1514,6 +1531,9 @@ startZoneInfo:
                                if ((ifID == ifID_home) || MULTIHOME_MODE) {
                                        ifID->ifZoneName = ZT_table[Index-1].Zone;
                                        (void)regDefaultZone(ifID);
+
+                                       /* Send zone change event */
+                                       atalk_post_msg(ifID->aa_ifp, KEV_ATALK_ZONEUPDATED, 0, &(ifID->ifZoneName));
                                }
                        }
                }