matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default lookup path for tc qdiscplines is /usr/lib/tc 

Get rid of dead code.
Make BODY static.

(Logical change 1.47)
This commit is contained in:
osdl.net!shemminger 2004-07-02 17:47:53 +00:00
parent d3ea2e8193
commit b7a4515085
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tc/tc.c
View File

@ -36,7 +36,7 @@ int show_raw = 0;
int resolve_hosts = 0; int resolve_hosts = 0;
int use_iec = 0; int use_iec = 0;
void *BODY; static void *BODY; /* cached handle dlopen(NULL) */
static struct qdisc_util * qdisc_list; static struct qdisc_util * qdisc_list;
static struct filter_util * filter_list; static struct filter_util * filter_list;
@ -84,19 +84,6 @@ static int parse_nofopt(struct filter_util *qu, char *fhandle, int argc, char **
return 0; return 0;
} }
#if 0
/* Builtin filter types */
static int f_parse_noopt(struct filter_util *qu, char *fhandle, int argc, char **argv, struct nlmsghdr *n)
{
if (argc || fhandle) {
fprintf(stderr, "Filter \"%s\" has no options.\n", qu->id);
return -1;
}
return 0;
}
#endif
struct qdisc_util *get_qdisc_kind(const char *str) struct qdisc_util *get_qdisc_kind(const char *str)
{ {
void *dlh; void *dlh;
@ -107,9 +94,10 @@ struct qdisc_util *get_qdisc_kind(const char *str)
if (strcmp(q->id, str) == 0) if (strcmp(q->id, str) == 0)
return q; return q;
snprintf(buf, sizeof(buf), "q_%s.so", str); snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);
dlh = dlopen(buf, RTLD_LAZY); dlh = dlopen(buf, RTLD_LAZY);
if (dlh == NULL) { if (!dlh) {
/* look in current binary, only open once */
dlh = BODY; dlh = BODY;
if (dlh == NULL) { if (dlh == NULL) {
dlh = BODY = dlopen(NULL, RTLD_LAZY); dlh = BODY = dlopen(NULL, RTLD_LAZY);
@ -151,7 +139,7 @@ struct filter_util *get_filter_kind(const char *str)
if (strcmp(q->id, str) == 0) if (strcmp(q->id, str) == 0)
return q; return q;
snprintf(buf, sizeof(buf), "f_%s.so", str); snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);
dlh = dlopen(buf, RTLD_LAZY); dlh = dlopen(buf, RTLD_LAZY);
if (dlh == NULL) { if (dlh == NULL) {
dlh = BODY; dlh = BODY;
@ -171,7 +159,6 @@ reg:
q->next = filter_list; q->next = filter_list;
filter_list = q; filter_list = q;
return q; return q;
noexist: noexist:
q = malloc(sizeof(*q)); q = malloc(sizeof(*q));
if (q) { if (q) {