diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2013-01-11 21:46:18 +0100 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2013-01-11 21:46:22 +0100 |
commit | b2e5bdbe10c4145f508fcf1486ffe29d5ce516f7 (patch) | |
tree | fae70e8c1580d99fee0c2a59d6bef831c4c9465c /ospfd/ospf_routemap.c | |
parent | a16dcf7c11d80775b07a0fa6f3ac5527190fb486 (diff) | |
parent | e0630cb4d61557f956318a088f68f1fc4d261ef3 (diff) |
Merge remote-tracking branch 'savannah/sf/ospfd'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospfd/ospf_routemap.c')
-rw-r--r-- | ospfd/ospf_routemap.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ospfd/ospf_routemap.c b/ospfd/ospf_routemap.c index adf81583..d0ebce66 100644 --- a/ospfd/ospf_routemap.c +++ b/ospfd/ospf_routemap.c @@ -443,12 +443,16 @@ static void * route_set_metric_compile (const char *arg) { u_int32_t *metric; + int32_t ret; metric = XCALLOC (MTYPE_ROUTE_MAP_COMPILED, sizeof (u_int32_t)); - *metric = atoi (arg); + ret = atoi (arg); - if (*metric >= 0) - return metric; + if (ret >= 0) + { + *metric = (u_int32_t)ret; + return metric; + } XFREE (MTYPE_ROUTE_MAP_COMPILED, metric); return NULL; |