1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
Description: disable IP multipath in ifconfig
libipmp is full of shit, it is not ready for 64-bit,
it sends raw structures over sockets, etc., etc.
Index: illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/defs.h
===================================================================
--- illumos-net-tools.orig/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/defs.h 2012-10-08 00:25:23.000000000 +0000
+++ illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/defs.h 2013-03-16 20:35:42.989210909 +0000
@@ -52,8 +52,11 @@
#include <arpa/inet.h>
#include <assert.h>
+#ifdef IFCONFIG_IPMP
#include <ipmp_mpathd.h>
#include <ipmp_admin.h>
+#endif
+
#include <libinetutil.h>
#include <alloca.h>
Index: illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c
===================================================================
--- illumos-net-tools.orig/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c 2012-10-08 00:25:23.000000000 +0000
+++ illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/ifconfig.c 2013-03-16 20:37:57.339953802 +0000
@@ -3693,6 +3693,7 @@
static int
create_ipmp(const char *grname, int af, const char *ifname, boolean_t implicit)
{
+#ifdef IFCONFIG_IPMP
static int ipmp_daemon_started;
uint32_t flags = IPADM_OPT_IPMP|IPADM_OPT_ACTIVE;
ipadm_status_t istatus;
@@ -3747,6 +3748,9 @@
start_ipmp_daemon();
return (0);
+#else
+ return (-1);
+#endif
}
/*
@@ -3755,6 +3759,7 @@
static void
start_ipmp_daemon(void)
{
+#ifdef IFCONFIG_IPMP
int retval;
ipmp_handle_t ipmp_handle;
@@ -3797,6 +3802,7 @@
default:
break;
}
+#endif
}
/*
Index: illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile
===================================================================
--- illumos-net-tools.orig/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile 2012-10-08 00:25:23.000000000 +0000
+++ illumos-net-tools/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile 2013-03-16 20:44:54.586442147 +0000
@@ -39,7 +39,12 @@
CPPFLAGS += -I$(CMDINETCOMMONDIR) -I$(SRC)/common/net/dhcp
CERRWARN += -_gcc=-Wno-uninitialized
CERRWARN += -_gcc=-Wno-parentheses
-LDLIBS += -ldhcpagent -ldlpi -linetutil -lipmp -ldladm -lipadm
+LDLIBS += -ldhcpagent -ldlpi -linetutil -ldladm -lipadm
+
+# For IP multipath:
+# CPPFLAGS += -DIFCONFIG_IPMP
+# LDFLAGS += -lipmp
+
LINTFLAGS += -m
ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%)
|
