int show_stats = 0;
int show_details = 0;
int show_raw = 0;
+int show_pretty = 0;
+
int resolve_hosts = 0;
int use_iec = 0;
+int force = 0;
+struct rtnl_handle rth;
-static void *BODY; /* cached handle dlopen(NULL) */
+static void *BODY = NULL; /* cached handle dlopen(NULL) */
static struct qdisc_util * qdisc_list;
static struct filter_util * filter_list;
-static int print_noqopt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
+static int print_noqopt(struct qdisc_util *qu, FILE *f,
+ struct rtattr *opt)
{
if (opt && RTA_PAYLOAD(opt))
- fprintf(f, "[Unknown qdisc, optlen=%u] ", RTA_PAYLOAD(opt));
+ fprintf(f, "[Unknown qdisc, optlen=%u] ",
+ (unsigned) RTA_PAYLOAD(opt));
return 0;
}
static int print_nofopt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u32 fhandle)
{
if (opt && RTA_PAYLOAD(opt))
- fprintf(f, "fh %08x [Unknown filter, optlen=%u] ", fhandle, RTA_PAYLOAD(opt));
+ fprintf(f, "fh %08x [Unknown filter, optlen=%u] ",
+ fhandle, (unsigned) RTA_PAYLOAD(opt));
else if (fhandle)
fprintf(f, "fh %08x ", fhandle);
return 0;
if (strcmp(q->id, str) == 0)
return q;
- snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);
+ snprintf(buf, sizeof(buf), "%s/q_%s.so", get_tc_lib(), str);
dlh = dlopen(buf, RTLD_LAZY);
if (!dlh) {
/* look in current binary, only open once */
}
}
- snprintf(buf, sizeof(buf), "%s_util", str);
+ snprintf(buf, sizeof(buf), "%s_qdisc_util", str);
q = dlsym(dlh, buf);
if (q == NULL)
goto noexist;
noexist:
q = malloc(sizeof(*q));
if (q) {
+
memset(q, 0, sizeof(*q));
- strncpy(q->id, str, 15);
+ q->id = strcpy(malloc(strlen(str)+1), str);
q->parse_qopt = parse_noqopt;
q->print_qopt = print_noqopt;
goto reg;
if (strcmp(q->id, str) == 0)
return q;
- snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);
+ snprintf(buf, sizeof(buf), "%s/f_%s.so", get_tc_lib(), str);
dlh = dlopen(buf, RTLD_LAZY);
if (dlh == NULL) {
dlh = BODY;
}
}
- snprintf(buf, sizeof(buf), "%s_util", str);
+ snprintf(buf, sizeof(buf), "%s_filter_util", str);
q = dlsym(dlh, buf);
if (q == NULL)
goto noexist;
return q;
}
-static void usage(void) __attribute__((noreturn));
-
static void usage(void)
{
fprintf(stderr, "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n"
- "where OBJECT := { qdisc | class | filter }\n"
- " OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -b[atch] file }\n");
- exit(-1);
+ " tc [-force] -batch filename\n"
+ "where OBJECT := { qdisc | class | filter | action | monitor }\n"
+ " OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -p[retty] | -b[atch] [filename] }\n");
}
+static int do_cmd(int argc, char **argv)
+{
+ if (matches(*argv, "qdisc") == 0)
+ return do_qdisc(argc-1, argv+1);
+
+ if (matches(*argv, "class") == 0)
+ return do_class(argc-1, argv+1);
+ if (matches(*argv, "filter") == 0)
+ return do_filter(argc-1, argv+1);
-int main(int argc, char **argv)
+ if (matches(*argv, "actions") == 0)
+ return do_action(argc-1, argv+1);
+
+ if (matches(*argv, "monitor") == 0)
+ return do_tcmonitor(argc-1, argv+1);
+
+ if (matches(*argv, "help") == 0) {
+ usage();
+ return 0;
+ }
+
+ fprintf(stderr, "Object \"%s\" is unknown, try \"tc help\".\n",
+ *argv);
+ return -1;
+}
+
+static int batch(const char *name)
{
- char *basename;
-
- basename = strrchr(argv[0], '/');
- if (basename == NULL)
- basename = argv[0];
- else
- basename++;
-
-
- /* batch mode */
- if (argc > 1 && matches(argv[1], "-batch") == 0) {
- FILE *batch;
- char line[400];
+ char *line = NULL;
+ size_t len = 0;
+ int ret = 0;
+
+ if (name && strcmp(name, "-") != 0) {
+ if (freopen(name, "r", stdin) == NULL) {
+ fprintf(stderr, "Cannot open file \"%s\" for reading: %s\n",
+ name, strerror(errno));
+ return -1;
+ }
+ }
+
+ tc_core_init();
+
+ if (rtnl_open(&rth, 0) < 0) {
+ fprintf(stderr, "Cannot open rtnetlink\n");
+ return -1;
+ }
+
+ cmdlineno = 0;
+ while (getcmdline(&line, &len, stdin) != -1) {
char *largv[100];
- int largc, ret=0;
-#define BMAXARG (sizeof(largv)/sizeof(char *)-2)
+ int largc;
- if (argc != 3) {
- fprintf(stderr, "Wrong number of arguments in batch mode\n");
- exit(-1);
- }
- if (matches(argv[2], "-") != 0) {
- if ((batch = fopen(argv[2], "r")) == NULL) {
- fprintf(stderr, "Cannot open file \"%s\" for reading: %s=n", argv[2], strerror(errno));
- exit(-1);
- }
- } else {
- if ((batch = fdopen(0, "r")) == NULL) {
- fprintf(stderr, "Cannot open stdin for reading: %s=n", strerror(errno));
- exit(-1);
- }
- }
+ largc = makeargs(line, largv, 100);
+ if (largc == 0)
+ continue; /* blank line */
- tc_core_init();
-
- while (fgets(line, sizeof(line)-1, batch)) {
- if (line[strlen(line)-1]=='\n') {
- line[strlen(line)-1] = '\0';
- } else {
- fprintf(stderr, "No newline at the end of line, looks like to long (%d chars or more)\n", strlen(line));
- exit(-1);
- }
- largc = 0;
- largv[largc]=strtok(line, " ");
- while ((largv[++largc]=strtok(NULL, " ")) != NULL) {
- if (largc > BMAXARG) {
- fprintf(stderr, "Over %d arguments in batch mode, enough!\n", BMAXARG);
- exit(-1);
- }
- }
-
- if (matches(largv[0], "qdisc") == 0) {
- ret += do_qdisc(largc-1, largv+1);
- } else if (matches(largv[0], "class") == 0) {
- ret += do_class(largc-1, largv+1);
- } else if (matches(largv[0], "filter") == 0) {
- ret += do_filter(largc-1, largv+1);
- } else if (matches(largv[0], "help") == 0) {
- usage(); /* note that usage() doesn't return */
- } else {
- fprintf(stderr, "Object \"%s\" is unknown, try \"tc help\".\n", largv[1]);
- exit(-1);
- }
+ if (do_cmd(largc, largv)) {
+ fprintf(stderr, "Command failed %s:%d\n", name, cmdlineno);
+ ret = 1;
+ if (!force)
+ break;
}
- fclose(batch);
- exit(0); /* end of batch, that's all */
}
+ if (line)
+ free(line);
+
+ rtnl_close(&rth);
+ return ret;
+}
+
+
+int main(int argc, char **argv)
+{
+ int ret;
+ int do_batching = 0;
+ char *batchfile = NULL;
while (argc > 1) {
if (argv[1][0] != '-')
++show_details;
} else if (matches(argv[1], "-raw") == 0) {
++show_raw;
+ } else if (matches(argv[1], "-pretty") == 0) {
+ ++show_pretty;
} else if (matches(argv[1], "-Version") == 0) {
printf("tc utility, iproute2-ss%s\n", SNAPSHOT);
- exit(0);
+ return 0;
} else if (matches(argv[1], "-iec") == 0) {
++use_iec;
} else if (matches(argv[1], "-help") == 0) {
usage();
+ return 0;
+ } else if (matches(argv[1], "-force") == 0) {
+ ++force;
+ } else if (matches(argv[1], "-batch") == 0) {
+ do_batching = 1;
+ if (argc > 2)
+ batchfile = argv[2];
+ argc--; argv++;
} else {
fprintf(stderr, "Option \"%s\" is unknown, try \"tc -help\".\n", argv[1]);
- exit(-1);
+ return -1;
}
argc--; argv++;
}
- tc_core_init();
+ if (do_batching)
+ return batch(batchfile);
- if (argc > 1) {
- if (matches(argv[1], "qdisc") == 0)
- return do_qdisc(argc-2, argv+2);
- if (matches(argv[1], "class") == 0)
- return do_class(argc-2, argv+2);
- if (matches(argv[1], "filter") == 0)
- return do_filter(argc-2, argv+2);
- if (matches(argv[1], "help") == 0)
- usage();
- fprintf(stderr, "Object \"%s\" is unknown, try \"tc help\".\n", argv[1]);
- exit(-1);
+ if (argc <= 1) {
+ usage();
+ return 0;
}
- usage();
+ tc_core_init();
+ if (rtnl_open(&rth, 0) < 0) {
+ fprintf(stderr, "Cannot open rtnetlink\n");
+ exit(1);
+ }
+
+ ret = do_cmd(argc-1, argv+1);
+ rtnl_close(&rth);
+
+ return ret;
}
projects / lisovros / iproute2_canprio.git / blobdiff