From: Apple <opensource@apple.com>
Date: Wed, 31 Mar 2010 21:25:36 +0000 (+0000)
Subject: network_cmds-329.2.1.tar.gz
X-Git-Tag: mac-os-x-1065^0
X-Git-Url: https://git.saurik.com/apple/network_cmds.git/commitdiff_plain/7d983f59f7d83614b94866000bdf59d1f7501008?ds=inline

network_cmds-329.2.1.tar.gz
---

diff --git a/ifconfig.tproj/ifconfig.c b/ifconfig.tproj/ifconfig.c
index 1c50df3..62bfd19 100644
--- a/ifconfig.tproj/ifconfig.c
+++ b/ifconfig.tproj/ifconfig.c
@@ -162,7 +162,7 @@ main(int argc, char *argv[])
 #ifndef __APPLE__
 	strlcpy(options, "adklmnuv", sizeof(options));
 #else
-	strlcpy(options, "adlmruv", sizeof(options));
+	strlcpy(options, "abdlmruv", sizeof(options));
 #endif
 	for (p = opts; p != NULL; p = p->next)
 		strlcat(options, p->opt, sizeof(options));
diff --git a/ifconfig.tproj/ifmedia.c b/ifconfig.tproj/ifmedia.c
index cefaacf..f525154 100644
--- a/ifconfig.tproj/ifmedia.c
+++ b/ifconfig.tproj/ifmedia.c
@@ -394,16 +394,16 @@ static struct ifmedia_description ifm_subtype_fddi_aliases[] =
 static struct ifmedia_description ifm_subtype_fddi_option_descriptions[] =
     IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS;
 
-#ifdef notdef
 static struct ifmedia_description ifm_subtype_ieee80211_descriptions[] =
     IFM_SUBTYPE_IEEE80211_DESCRIPTIONS;
 
-static struct ifmedia_description ifm_subtype_ieee80211_aliases[] =
-    IFM_SUBTYPE_IEEE80211_ALIASES;
-
 static struct ifmedia_description ifm_subtype_ieee80211_option_descriptions[] =
     IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS;
 
+#ifdef notdef
+static struct ifmedia_description ifm_subtype_ieee80211_aliases[] =
+    IFM_SUBTYPE_IEEE80211_ALIASES;
+
 struct ifmedia_description ifm_subtype_ieee80211_mode_descriptions[] =
     IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS;
 
@@ -497,6 +497,24 @@ static struct ifmedia_type_to_subtype ifmedia_types_to_subtypes[] = {
 			{ NULL, 0 },
 		},
 	},
+#ifdef __APPLE__
+	{
+		{
+			{ &ifm_subtype_shared_descriptions[0], 0 },
+			{ &ifm_subtype_shared_aliases[0], 1 },
+			{ &ifm_subtype_ieee80211_descriptions[0], 0 },
+			{ NULL, 0 },
+		},
+		{
+			{ &ifm_shared_option_descriptions[0], 0 },
+			{ &ifm_subtype_ieee80211_option_descriptions[0], 1 },
+			{ NULL, 0 },
+		},
+		{
+			{ NULL, 0 },
+		},
+	},
+#else /* __APPLE__ */
 #ifdef notdef
 	{
 		{
@@ -535,6 +553,7 @@ static struct ifmedia_type_to_subtype ifmedia_types_to_subtypes[] = {
 		},
 	},
 #endif
+#endif /* __APPLE__ */
 };
 
 static int
diff --git a/netstat.tproj/route.c b/netstat.tproj/route.c
index 1e7befc..e7b8205 100644
--- a/netstat.tproj/route.c
+++ b/netstat.tproj/route.c
@@ -116,7 +116,9 @@ struct bits {
 	{ RTF_BLACKHOLE,'B' },
 	{ RTF_BROADCAST,'b' },
 	{ RTF_IFSCOPE,	'I' },
+#ifdef RTF_IFREF
 	{ RTF_IFREF,	'i' },
+#endif /* RTF_IFREF */
 	{ 0 }
 };
 
diff --git a/route.tproj/route.c b/route.tproj/route.c
index b1960d7..c43f159 100644
--- a/route.tproj/route.c
+++ b/route.tproj/route.c
@@ -1299,8 +1299,10 @@ 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);
+#ifdef RTF_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);