diff options
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/unicast/addr-auth.h | 4 | ||||
| -rw-r--r-- | src/ipcpd/unicast/dt.c | 4 | ||||
| -rw-r--r-- | src/ipcpd/unicast/routing/link-state.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/ipcpd/unicast/addr-auth.h b/src/ipcpd/unicast/addr-auth.h index b453cba5..0d2cd4c0 100644 --- a/src/ipcpd/unicast/addr-auth.h +++ b/src/ipcpd/unicast/addr-auth.h @@ -27,12 +27,12 @@ #include <stdint.h> -#define ADDR_FMT32 "%02x:%02x:%02x:%02x" +#define ADDR_FMT32 "%02x.%02x.%02x.%02x" #define ADDR_VAL32(a) \ ((uint8_t *) a)[0], ((uint8_t *) a)[1], \ ((uint8_t *) a)[2], ((uint8_t *) a)[3] -#define ADDR_FMT64 ADDR_FMT32 ":" ADDR_FMT32 +#define ADDR_FMT64 ADDR_FMT32 "." ADDR_FMT32 #define ADDR_VAL64(a) ADDR_VAL32(a), ADDR_VAL32(a + 4) int addr_auth_init(enum pol_addr_auth type, diff --git a/src/ipcpd/unicast/dt.c b/src/ipcpd/unicast/dt.c index aece10cb..e2679ffe 100644 --- a/src/ipcpd/unicast/dt.c +++ b/src/ipcpd/unicast/dt.c @@ -215,7 +215,7 @@ static int dt_rib_read(const char * path, if (dt.stat[fd].addr == dt.addr) sprintf(addrstr, "%s", dt.comps[fd].name); else - sprintf(addrstr, "%" PRIu64, dt.stat[fd].addr); + sprintf(addrstr, ADDR_FMT32, ADDR_VAL32(&dt.stat[fd].addr)); tm = gmtime(&dt.stat[fd].stamp); strftime(tmstr, sizeof(tmstr), RIB_TM_FORMAT, tm); @@ -652,7 +652,7 @@ int dt_init(struct dt_config cfg) dt.n_flows = 0; #endif - sprintf(dtstr, "%s.%" PRIu64, DT, dt.addr); + sprintf(dtstr, "%s." ADDR_FMT32, DT, ADDR_VAL32(&dt.addr)); if (rib_reg(dtstr, &r_ops)) { log_err("Failed to register RIB."); goto fail_rib_reg; diff --git a/src/ipcpd/unicast/routing/link-state.c b/src/ipcpd/unicast/routing/link-state.c index 1b0faab8..e5edf539 100644 --- a/src/ipcpd/unicast/routing/link-state.c +++ b/src/ipcpd/unicast/routing/link-state.c @@ -62,7 +62,7 @@ #define CLOCK_REALTIME_COARSE CLOCK_REALTIME #endif -#define LINK_FMT ADDR_FMT32 " -- " ADDR_FMT32 +#define LINK_FMT ADDR_FMT32 "--" ADDR_FMT32 #define LINK_VAL(src, dst) ADDR_VAL32(&src), ADDR_VAL32(&dst) #define LSU_FMT "LSU ["ADDR_FMT32 " -- " ADDR_FMT32 " seq: %09" PRIu64 "]" @@ -191,7 +191,7 @@ static struct adjacency * get_adj(const char * path) list_for_each(p, &ls.db.list) { struct adjacency * a = list_entry(p, struct adjacency, next); - sprintf(entry, "%" PRIu64 ".%" PRIu64, a->src, a->dst); + sprintf(entry, LINK_FMT, LINK_VAL(a->src, a->dst)); if (strcmp(entry, path) == 0) return a; } |