diff options
| author | Thomas Osterried <thomas@osterried.de> | 2005-10-27 13:25:27 +0000 |
|---|---|---|
| committer | Thomas Osterried <thomas@osterried.de> | 2005-10-27 13:25:27 +0000 |
| commit | 20a2c84a1c4488ae730bcb8c0ae52a12624c1848 (patch) | |
| tree | bec4be7637c82517c217ef6eeca2e6bbe2df5c17 /ax25rtd | |
| parent | 6c8ea5098046ec051c59e3dee2a561118c6a00f8 (diff) | |
- config.c, listener.c:
users of newer versions of ax25rtd have problems with the
ip-encaps-dev feature (needed only in some environments).
the problem was the implementation of the feature, which results
in the obvious problem that after an upgrade ax25rtd will not learn
any ip-routes and arp's. a secondary problem is, when you have more
than one interface, ip-routes/arp's could be learned only
via _one_ interface.
- config.c:
ip-maxroutes was ignored
- ax25rtd.conf:
s/ax24/ax25/
Diffstat (limited to 'ax25rtd')
| -rw-r--r-- | ax25rtd/ax25rtd.conf | 2 | ||||
| -rw-r--r-- | ax25rtd/config.c | 6 | ||||
| -rw-r--r-- | ax25rtd/listener.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ax25rtd/ax25rtd.conf b/ax25rtd/ax25rtd.conf index 47111a9..252b394 100644 --- a/ax25rtd/ax25rtd.conf +++ b/ax25rtd/ax25rtd.conf @@ -76,7 +76,7 @@ arp-add no [ax0] # ax25-learn-routes yes -ax24-learn-only-mine yes +ax25-learn-only-mine yes ip-learn-routes yes ip-adjust-mode no arp-add yes diff --git a/ax25rtd/config.c b/ax25rtd/config.c index 4d63b51..7fa250d 100644 --- a/ax25rtd/config.c +++ b/ax25rtd/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c,v 1.2 2001/09/12 13:18:43 terry Exp $ +/* $Id: config.c,v 1.3 2005/10/27 13:25:28 dl9sau Exp $ * * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com) * @@ -477,7 +477,7 @@ void load_config() missing_arg(cmd); } else if (!strcmp(cmd, "ip-maxroutes")) { if (arg) - ax25_maxroutes = atoi(arg); + ip_maxroutes = atoi(arg); else missing_arg(cmd); @@ -601,7 +601,7 @@ void interpret_command(int fd, unsigned char *buf) ipmode = (*arg == 'v'); - if ((config = + if (*ip_encaps_dev && (config = dev_get_config(ip_encaps_dev)) == NULL) { printf("no config for %s\n", ip_encaps_dev); diff --git a/ax25rtd/listener.c b/ax25rtd/listener.c index d3bd698..afaa19c 100644 --- a/ax25rtd/listener.c +++ b/ax25rtd/listener.c @@ -1,4 +1,4 @@ -/* $Id: listener.c,v 1.3 2001/11/27 04:57:43 csmall Exp $ +/* $Id: listener.c,v 1.4 2005/10/27 13:25:28 dl9sau Exp $ * * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com) * @@ -565,7 +565,7 @@ void ax25_receive(int sock) ipmode = (ctl == LAPB_I); if (ip != 0) { - if ((config = dev_get_config(ip_encaps_dev)) == NULL) + if (*ip_encaps_dev && (config = dev_get_config(ip_encaps_dev)) == NULL) return; action = |