network_cmds-457.tar.gz

[apple/network_cmds.git] / route.tproj / route.c

diff --git a/route.tproj/route.c b/route.tproj/route.c
index 818bdd0fbf7cdf9a0a50c6f12ed2060f88140889..c2508bdef7e2140610dc5eea9437b2a32af1a103 100644 (file)
--- a/route.tproj/route.c
+++ b/route.tproj/route.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008-2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2013 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *


@@ -59,20 +59,13 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

+

 #ifndef lint
 __unused static const char copyright[] =
 "@(#) Copyright (c) 1983, 1989, 1991, 1993\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
 __unused static const char copyright[] =
 "@(#) Copyright (c) 1983, 1989, 1991, 1993\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 

-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)route.c    8.3 (Berkeley) 3/19/94";
-#endif
-__unused static const char rcsid[] =
-       "$Id: route.c,v 1.4 2006/02/07 06:22:29 lindak Exp $";
-#endif /* not lint */
-

 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/socket.h>


@@ -328,7 +321,7 @@ routename(sa)
                if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
                    (cp = index(domain, '.'))) {
                        domain[MAXHOSTNAMELEN] = '\0';
                if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
                    (cp = index(domain, '.'))) {
                        domain[MAXHOSTNAMELEN] = '\0';

-                       (void) strlcpy(domain, cp + 1, sizeof(domain));
+                       (void) memmove(domain, cp + 1, strlen(cp + 1) + 1);

                } else
                        domain[0] = 0;
        }
                } else
                        domain[0] = 0;
        }


@@ -1297,7 +1290,7 @@ char routeflags[] =
 "\011CLONING\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016b016"
 "\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3\024b024"
 "\025PINNED\026LOCAL\027BROADCAST\030MULTICAST\031IFSCOPE\032CONDEMNED"
 "\011CLONING\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016b016"
 "\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3\024b024"
 "\025PINNED\026LOCAL\027BROADCAST\030MULTICAST\031IFSCOPE\032CONDEMNED"

-"\033IFREF";
+"\033IFREF\034PROXY\035ROUTER";

 char ifnetflags[] =
 "\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6b6\7RUNNING\010NOARP"
 "\011PPROMISC\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1"
 char ifnetflags[] =
 "\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6b6\7RUNNING\010NOARP"
 "\011PPROMISC\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1"


@@ -1350,10 +1343,8 @@ print_rtmsg(rtm, msglen)
                        (long)rtm->rtm_pid, rtm->rtm_seq, rtm->rtm_errno);
                if (rtm->rtm_flags & RTF_IFSCOPE)
                        (void) printf("ifscope %d, ", rtm->rtm_index);
                        (long)rtm->rtm_pid, rtm->rtm_seq, rtm->rtm_errno);
                if (rtm->rtm_flags & RTF_IFSCOPE)
                        (void) printf("ifscope %d, ", rtm->rtm_index);

-#ifdef RTF_IFREF

                        if (rtm->rtm_flags & RTF_IFREF)
                        (void) printf("ifref, ");
                        if (rtm->rtm_flags & RTF_IFREF)
                        (void) printf("ifref, ");

-#endif /* RTF_IFREF */

                        (void) printf("flags:");
                bprintf(stdout, rtm->rtm_flags, routeflags);
                pmsg_common(rtm);
                        (void) printf("flags:");
                bprintf(stdout, rtm->rtm_flags, routeflags);
                pmsg_common(rtm);


@@ -1371,7 +1362,7 @@ print_getmsg(rtm, msglen)
        register char *cp;
        register int i;
 
        register char *cp;
        register int i;
 

-       (void) printf("   route to: %s\n", routename(&so_dst));
+       (void) printf("   route to: %s\n", routename(&so_dst.sa));

        if (rtm->rtm_version != RTM_VERSION) {
                warnx("routing message version %d not understood",
                     rtm->rtm_version);
        if (rtm->rtm_version != RTM_VERSION) {
                warnx("routing message version %d not understood",
                     rtm->rtm_version);