aboutsummaryrefslogtreecommitdiff
path: root/networking/brctl.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-04-06 07:17:02 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-04-06 07:17:02 +0000
commit278a1c22645263f1a82bb3437345e3d96c3f13eb (patch)
tree1e9f967ca896674212d8aecb17919bacbb4c1515 /networking/brctl.c
parentad4da989e3767cdf4620725c16908b4f99dbe2c9 (diff)
downloadbusybox-w32-278a1c22645263f1a82bb3437345e3d96c3f13eb.tar.gz
busybox-w32-278a1c22645263f1a82bb3437345e3d96c3f13eb.tar.bz2
busybox-w32-278a1c22645263f1a82bb3437345e3d96c3f13eb.zip
brctl: optional support for "show" cmd (by L. Gabriel Somlo <somlo AT cmu.edu>)
function old new delta brctl_main 739 1186 +447 if_indextoname - 104 +104 static.keywords 827 841 +14 static.ops - 7 +7 packed_usage 23978 23976 -2
Diffstat (limited to 'networking/brctl.c')
-rw-r--r--networking/brctl.c180
1 files changed, 114 insertions, 66 deletions
diff --git a/networking/brctl.c b/networking/brctl.c
index 2bb03dd82..bd13878b2 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -25,12 +25,6 @@
25/* #define BRCTL_USE_INTERNAL 0 */ /* use exact conversion */ 25/* #define BRCTL_USE_INTERNAL 0 */ /* use exact conversion */
26#define BRCTL_USE_INTERNAL 1 26#define BRCTL_USE_INTERNAL 1
27 27
28#ifdef ENABLE_FEATURE_BRCTL_SHOW
29#error Remove these
30#endif
31#define ENABLE_FEATURE_BRCTL_SHOW 0
32#define USE_FEATURE_BRCTL_SHOW(...)
33
34#if ENABLE_FEATURE_BRCTL_FANCY 28#if ENABLE_FEATURE_BRCTL_FANCY
35#include <linux/if_bridge.h> 29#include <linux/if_bridge.h>
36 30
@@ -96,7 +90,7 @@ int brctl_main(int argc ATTRIBUTE_UNUSED, char **argv)
96 "setageing\0" "setfd\0" "sethello\0" "setmaxage\0" 90 "setageing\0" "setfd\0" "sethello\0" "setmaxage\0"
97 "setpathcost\0" "setportprio\0" "setbridgeprio\0" 91 "setpathcost\0" "setportprio\0" "setbridgeprio\0"
98 ) 92 )
99 USE_FEATURE_BRCTL_SHOW("showmacs\0" "show\0"); 93 USE_FEATURE_BRCTL_SHOW("showmacs\0" "show\0");
100 94
101 enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif 95 enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
102 USE_FEATURE_BRCTL_FANCY(, 96 USE_FEATURE_BRCTL_FANCY(,
@@ -104,31 +98,87 @@ int brctl_main(int argc ATTRIBUTE_UNUSED, char **argv)
104 ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage, 98 ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
105 ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio 99 ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
106 ) 100 )
107 USE_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show) 101 USE_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show)
108 }; 102 };
109 103
110 int fd; 104 int fd;
111 smallint key; 105 smallint key;
112 struct ifreq ifr; 106 struct ifreq ifr;
113 char *br, *brif; 107 char *br, *brif;
114#if ENABLE_FEATURE_BRCTL_FANCY
115 unsigned long args[4] = {0, 0, 0, 0};
116 int port;
117 int tmp;
118#endif
119 108
120 argv++; 109 argv++;
121 while (*argv) { 110 while (*argv) {
111#if ENABLE_FEATURE_BRCTL_FANCY
112 int ifidx[MAX_PORTS];
113 unsigned long args[4];
114 ifr.ifr_data = (char *) &args;
115#endif
116
122 key = index_in_strings(keywords, *argv); 117 key = index_in_strings(keywords, *argv);
123 if (key == -1) /* no match found in keywords array, bail out. */ 118 if (key == -1) /* no match found in keywords array, bail out. */
124 bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name); 119 bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
125 argv++; 120 argv++;
121 fd = xsocket(AF_INET, SOCK_STREAM, 0);
122
126#if ENABLE_FEATURE_BRCTL_SHOW 123#if ENABLE_FEATURE_BRCTL_SHOW
127 if (key == ARG_show) { /* show */ 124 if (key == ARG_show) { /* show */
128 goto out; /* FIXME: implement me! :) */ 125 char brname[IFNAMSIZ];
126 int bridx[MAX_PORTS];
127 int i, num;
128 arm_ioctl(args, BRCTL_GET_BRIDGES,
129 (unsigned long) bridx, MAX_PORTS);
130 num = xioctl(fd, SIOCGIFBR, args);
131 printf("bridge name\tbridge id\t\tSTP enabled\tinterfaces\n");
132 for (i = 0; i < num; i++) {
133 char ifname[IFNAMSIZ];
134 int j, tabs;
135 struct __bridge_info bi;
136 unsigned char *x;
137
138 if (!if_indextoname(bridx[i], brname))
139 bb_perror_msg_and_die("can't get bridge name for index %d", i);
140 safe_strncpy(ifr.ifr_name, brname, IFNAMSIZ);
141
142 arm_ioctl(args, BRCTL_GET_BRIDGE_INFO,
143 (unsigned long) &bi, 0);
144 xioctl(fd, SIOCDEVPRIVATE, &ifr);
145 printf("%s\t\t", brname);
146
147 /* print bridge id */
148 x = (unsigned char *) &bi.bridge_id;
149 for (j = 0; j < 8; j++) {
150 printf("%.2x", x[j]);
151 if (j == 1)
152 bb_putchar('.');
153 }
154 printf(bi.stp_enabled ? "\tyes" : "\tno");
155
156 /* print interface list */
157 arm_ioctl(args, BRCTL_GET_PORT_LIST,
158 (unsigned long) ifidx, MAX_PORTS);
159 xioctl(fd, SIOCDEVPRIVATE, &ifr);
160 tabs = 0;
161 for (j = 0; j < MAX_PORTS; j++) {
162 if (!ifidx[j])
163 continue;
164 if (!if_indextoname(ifidx[j], ifname))
165 bb_perror_msg_and_die("can't get interface name for index %d", j);
166 if (tabs)
167 printf("\t\t\t\t\t");
168 else
169 tabs = 1;
170 printf("\t\t%s\n", ifname);
171 }
172 if (!tabs) /* bridge has no interfaces */
173 bb_putchar('\n');
174 }
175 goto done;
129 } 176 }
130#endif 177#endif
131 fd = xsocket(AF_INET, SOCK_STREAM, 0); 178
179 if (!*argv) /* all but 'show' need at least one argument */
180 bb_show_usage();
181
132 br = *argv++; 182 br = *argv++;
133 183
134 if (key == ARG_addbr || key == ARG_delbr) { /* addbr or delbr */ 184 if (key == ARG_addbr || key == ARG_delbr) { /* addbr or delbr */
@@ -137,11 +187,13 @@ int brctl_main(int argc ATTRIBUTE_UNUSED, char **argv)
137 br, "bridge %s", br); 187 br, "bridge %s", br);
138 goto done; 188 goto done;
139 } 189 }
140 if (!*argv) /* all but 'show' need at least one argument */ 190
191 if (!*argv) /* all but 'addif/delif' need at least two arguments */
141 bb_show_usage(); 192 bb_show_usage();
193
142 safe_strncpy(ifr.ifr_name, br, IFNAMSIZ); 194 safe_strncpy(ifr.ifr_name, br, IFNAMSIZ);
143 if (key == ARG_addif || key == ARG_delif) { /* addif or delif */ 195 if (key == ARG_addif || key == ARG_delif) { /* addif or delif */
144 brif = *argv++; 196 brif = *argv;
145 ifr.ifr_ifindex = if_nametoindex(brif); 197 ifr.ifr_ifindex = if_nametoindex(brif);
146 if (!ifr.ifr_ifindex) { 198 if (!ifr.ifr_ifindex) {
147 bb_perror_msg_and_die("iface %s", brif); 199 bb_perror_msg_and_die("iface %s", brif);
@@ -149,76 +201,72 @@ int brctl_main(int argc ATTRIBUTE_UNUSED, char **argv)
149 ioctl_or_perror_and_die(fd, 201 ioctl_or_perror_and_die(fd,
150 key == ARG_addif ? SIOCBRADDIF : SIOCBRDELIF, 202 key == ARG_addif ? SIOCBRADDIF : SIOCBRDELIF,
151 &ifr, "bridge %s", br); 203 &ifr, "bridge %s", br);
152 goto done; 204 goto done_next_argv;
153 } 205 }
154#if ENABLE_FEATURE_BRCTL_FANCY 206#if ENABLE_FEATURE_BRCTL_FANCY
155 ifr.ifr_data = (char *) &args;
156 if (key == ARG_stp) { /* stp */ 207 if (key == ARG_stp) { /* stp */
157 /* FIXME: parsing yes/y/on/1 versus no/n/off/0 is too involved */ 208 /* FIXME: parsing yes/y/on/1 versus no/n/off/0 is too involved */
158 arm_ioctl(args, BRCTL_SET_BRIDGE_STP_STATE, 209 arm_ioctl(args, BRCTL_SET_BRIDGE_STP_STATE,
159 (unsigned)(**argv - '0'), 0); 210 (unsigned)(**argv - '0'), 0);
160 goto fire; 211 goto fire;
161 } 212 }
162 if ((unsigned)(key - ARG_stp) < 5) { /* time related ops */ 213 if ((unsigned)(key - ARG_setageing) < 4) { /* time related ops */
163 unsigned long op = (key == ARG_setageing) ? BRCTL_SET_AGEING_TIME : 214 static const uint8_t ops[] ALIGN1 = {
164 (key == ARG_setfd) ? BRCTL_SET_BRIDGE_FORWARD_DELAY : 215 BRCTL_SET_AGEING_TIME, /* ARG_setageing */
165 (key == ARG_sethello) ? BRCTL_SET_BRIDGE_HELLO_TIME : 216 BRCTL_SET_BRIDGE_FORWARD_DELAY, /* ARG_setfd */
166 /*key == ARG_setmaxage*/ BRCTL_SET_BRIDGE_MAX_AGE; 217 BRCTL_SET_BRIDGE_HELLO_TIME, /* ARG_sethello */
167 arm_ioctl(args, op, str_to_jiffies(*argv), 0); 218 BRCTL_SET_BRIDGE_MAX_AGE /* ARG_setmaxage */
219 };
220 arm_ioctl(args, ops[key - ARG_setageing], str_to_jiffies(*argv), 0);
168 goto fire; 221 goto fire;
169 } 222 }
170 port = -1;
171 if (key == ARG_setpathcost || key == ARG_setportprio) {/* get portnum */
172 int ifidx[MAX_PORTS];
173 unsigned i;
174
175 port = if_nametoindex(*argv);
176 if (!port)
177 bb_error_msg_and_die(bb_msg_invalid_arg, *argv, "port");
178 argv++;
179 memset(ifidx, 0, sizeof ifidx);
180 arm_ioctl(args, BRCTL_GET_PORT_LIST, (unsigned long)ifidx,
181 MAX_PORTS);
182 xioctl(fd, SIOCDEVPRIVATE, &ifr);
183 for (i = 0; i < MAX_PORTS; i++) {
184 if (ifidx[i] == port) {
185 port = i;
186 break;
187 }
188 }
189 }
190 if (key == ARG_setpathcost 223 if (key == ARG_setpathcost
191 || key == ARG_setportprio 224 || key == ARG_setportprio
192 || key == ARG_setbridgeprio 225 || key == ARG_setbridgeprio
193 ) { 226 ) {
194 unsigned long op = (key == ARG_setpathcost) ? BRCTL_SET_PATH_COST : 227 static const uint8_t ops[] ALIGN1 = {
195 (key == ARG_setportprio) ? BRCTL_SET_PORT_PRIORITY : 228 BRCTL_SET_PATH_COST, /* ARG_setpathcost */
196 /*key == ARG_setbridgeprio*/ BRCTL_SET_BRIDGE_PRIORITY; 229 BRCTL_SET_PORT_PRIORITY, /* ARG_setportprio */
197 unsigned long arg1 = port; 230 BRCTL_SET_BRIDGE_PRIORITY /* ARG_setbridgeprio */
198 unsigned long arg2; 231 };
199# if BRCTL_USE_INTERNAL 232 int port = -1;
200 tmp = xatoi(*argv); 233 unsigned arg1, arg2;
201# else 234
202 if (sscanf(*argv, "%i", &tmp) != 1) 235 if (key != ARG_setbridgeprio) {
203 bb_error_msg_and_die(bb_msg_invalid_arg, *argv, 236 /* get portnum */
204 key == ARG_setpathcost ? "cost" : "prio"); 237 unsigned i;
205# endif 238
239 port = if_nametoindex(*argv++);
240 if (!port)
241 bb_error_msg_and_die(bb_msg_invalid_arg, *argv, "port");
242 memset(ifidx, 0, sizeof ifidx);
243 arm_ioctl(args, BRCTL_GET_PORT_LIST, (unsigned long)ifidx,
244 MAX_PORTS);
245 xioctl(fd, SIOCDEVPRIVATE, &ifr);
246 for (i = 0; i < MAX_PORTS; i++) {
247 if (ifidx[i] == port) {
248 port = i;
249 break;
250 }
251 }
252 }
253 arg1 = port;
254 arg2 = xatoi_u(*argv);
206 if (key == ARG_setbridgeprio) { 255 if (key == ARG_setbridgeprio) {
207 arg1 = tmp; 256 arg1 = arg2;
208 arg2 = 0; 257 arg2 = 0;
209 } else 258 }
210 arg2 = tmp; 259 arm_ioctl(args, ops[key - ARG_setpathcost], arg1, arg2);
211 arm_ioctl(args, op, arg1, arg2);
212 } 260 }
213 fire: 261 fire:
214 /* Execute the previously set command. */ 262 /* Execute the previously set command */
215 xioctl(fd, SIOCDEVPRIVATE, &ifr); 263 xioctl(fd, SIOCDEVPRIVATE, &ifr);
216 argv++;
217#endif 264#endif
265 done_next_argv:
266 argv++;
218 done: 267 done:
219 if (ENABLE_FEATURE_CLEAN_UP) 268 close(fd);
220 close(fd);
221 } 269 }
222 USE_FEATURE_BRCTL_SHOW(out:) 270
223 return EXIT_SUCCESS; 271 return EXIT_SUCCESS;
224} 272}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 20:28:43 +0000