network_cmds-511.tar.gz

[apple/network_cmds.git] / alias / alias_nbt.c

diff --git a/alias/alias_nbt.c b/alias/alias_nbt.c
index 2afc21d09ad8e13b125d97d41929f6a00683b3b1..4ff5d4104732f80a6ca5f5085c24bb6b067e6b8e 100644 (file)
--- a/alias/alias_nbt.c
+++ b/alias/alias_nbt.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -124,20 +121,26 @@ static void PrintRcode( u_char rcode )  {
 
        switch (rcode) {
                case FMT_ERR:
-                       printf("\nFormat Error.");
+                       printf("\n  Format Error.\n");
+                       break;
                case SRV_ERR:
-                       printf("\nSever failure.");
+                       printf("\n  Server failure.\n");
+                       break;
                case IMP_ERR:
-                       printf("\nUnsupported request error.\n");
+                       printf("\n  Unsupported request error.\n");
+                       break;
                case RFS_ERR:
-                       printf("\nRefused error.\n");
+                       printf("\n  Refused error.\n");
+                       break;
                case ACT_ERR:
-                       printf("\nActive error.\n");
+                       printf("\n  Active error.\n");
+                       break;
                case CFT_ERR:
-                       printf("\nName in conflict error.\n");
+                       printf("\n  Name in conflict error.\n");
+                       break;
                default:
-                       printf("\n???=%0x\n", rcode );
-
+                       printf("\n  \?\?\?=%0x\n", rcode );
+                       break;
        }       
 }
 #endif
@@ -238,7 +241,7 @@ int AliasHandleUdpNbt(
     if ((char *)(ndh + 1) > pmax)
            return(-1);
 #ifdef DEBUG
-       printf("\nType=%02x,", ndh->type );
+       printf("Type=%02x,", ndh->type );
 #endif
        switch ( ndh->type ) {
                case DGM_DIRECT_UNIQ:
@@ -370,8 +373,8 @@ AliasHandleResourceNB(
 
        /* Processing all in_addr array */
 #ifdef DEBUG
-       printf("NB rec[%s", inet_ntoa(nbtarg->oldaddr));
-            printf("->%s, %dbytes] ",inet_ntoa(nbtarg->newaddr ), bcount);
+       printf("  NB rec[%s", inet_ntoa(nbtarg->oldaddr));
+            printf("->%s, %d bytes] ",inet_ntoa(nbtarg->newaddr ), bcount);
 #endif
        while ( nb != NULL && bcount != 0 )  {
                if ((char *)(nb + 1) > pmax) {
@@ -580,7 +583,7 @@ AliasHandleResource(
                if (q == NULL || (char *)(q + 1) > pmax)
                        break;
 #ifdef DEBUG
-               printf("type=%02x, count=%d\n", ntohs(q->type), count );
+               printf("\n  type=%02x, count=%d\n", ntohs(q->type), count );
 #endif
 
                /* Type and Class filed */
@@ -677,7 +680,7 @@ int AliasHandleUdpNbtNS(
                ntohs(nsh->ancount),
                ntohs(nsh->nscount),
                ntohs(nsh->arcount),
-       (u_char *)p -(u_char *)nsh
+               (int)((u_char *)p -(u_char *)nsh)
     );
 #endif
 
@@ -722,6 +725,7 @@ int AliasHandleUdpNbtNS(
        }
 
 #ifdef DEBUG
+       if (nsh->rcode)
                PrintRcode(nsh->rcode);
 #endif
     return ((p == NULL) ? -1 : 0);