diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-07 09:58:31 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-07 09:58:31 +0200 |
| commit | 0c8c8151fc1fb0dbfcd682153f50192ea1369884 (patch) | |
| tree | 90527df8068d1bbc71c29ed87a1cc8e1dce9f8c0 /nest | |
| parent | a815d62d5902fb84c28c77726dbe94fc7528bf36 (diff) | |
| parent | 1a7daab126471374841e41de7f7e590ab22f35c8 (diff) | |
Merge branch 'int-new-channels' of gitlab.labs.nic.cz:labs/bird into int-new-channels
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/proto.c | 8 | ||||
| -rw-r--r-- | nest/rt-dev.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nest/proto.c b/nest/proto.c index 5b55f9ee..f712fe5f 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -39,6 +39,12 @@ static int graceful_restart_state; static u32 graceful_restart_locks; static char *p_states[] = { "DOWN", "START", "UP", "STOP" }; +static char *cs_states[] = { + [CS_DOWN] = "DOWN", + [CS_START] = "START", + [CS_UP] = "UP", + [CS_FLUSHING] = "FLUSHING" +}; extern struct protocol proto_unix_iface; @@ -313,7 +319,7 @@ channel_set_state(struct channel *c, uint state) uint cs = c->channel_state; uint es = c->export_state; - DBG("%s reporting state transition %s/%s -> */%s\n", p->name, c_states[cs], p_states[ops], p_states[ps]); + DBG("%s reporting channel %s state transition %s -> %s\n", c->proto->name, c->name, cs_states[cs], cs_states[state]); if (state == cs) return; diff --git a/nest/rt-dev.c b/nest/rt-dev.c index 17737853..a996f4fc 100644 --- a/nest/rt-dev.c +++ b/nest/rt-dev.c @@ -34,7 +34,7 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad) if (!EMPTY_LIST(cf->iface_list) && !iface_patt_find(&cf->iface_list, ad->iface, ad->iface->addr)) - /* Empty list is automagically treated as "*" */ + /* Empty list is automatically treated as "*" */ return; if (ad->flags & IA_SECONDARY) |