Complain about missing %defaultroute support only if one is actually used
This commit is contained in:
@@ -245,6 +245,10 @@ kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token
|
|||||||
end->addr = cfg->defaultroute.addr;
|
end->addr = cfg->defaultroute.addr;
|
||||||
end->nexthop = cfg->defaultroute.nexthop;
|
end->nexthop = cfg->defaultroute.nexthop;
|
||||||
}
|
}
|
||||||
|
else if (!cfg->defaultroute.supported)
|
||||||
|
{
|
||||||
|
plog("%%defaultroute not supported, fallback to %%any");
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
plog("# default route not known: %s=%s", name, value);
|
plog("# default route not known: %s=%s", name, value);
|
||||||
|
|||||||
@@ -173,6 +173,7 @@ get_defaultroute(defaultroute_t *defaultroute)
|
|||||||
defaultroute->defined = TRUE;
|
defaultroute->defined = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
defaultroute->supported = TRUE;
|
||||||
|
|
||||||
if (!defaultroute->defined)
|
if (!defaultroute->defined)
|
||||||
plog("no default route - cannot cope with %%defaultroute!!!");
|
plog("no default route - cannot cope with %%defaultroute!!!");
|
||||||
@@ -186,9 +187,7 @@ get_defaultroute(defaultroute_t *defaultroute)
|
|||||||
void
|
void
|
||||||
get_defaultroute(defaultroute_t *defaultroute)
|
get_defaultroute(defaultroute_t *defaultroute)
|
||||||
{
|
{
|
||||||
memset(defaultroute, 0, sizeof(defaultroute_t));
|
defaultroute->supported = FALSE;
|
||||||
defaultroute->defined = TRUE;
|
|
||||||
plog("%%defaultroute not supported, fallback to %%any");
|
|
||||||
}
|
}
|
||||||
#endif /* START_PLUTO */
|
#endif /* START_PLUTO */
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
bool defined;
|
bool defined;
|
||||||
|
bool supported;
|
||||||
char iface[IFNAMSIZ];
|
char iface[IFNAMSIZ];
|
||||||
ip_address addr;
|
ip_address addr;
|
||||||
ip_address nexthop;
|
ip_address nexthop;
|
||||||
|
|||||||
Reference in New Issue
Block a user