Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'int-new-channels' of gitlab.labs.nic.cz:labs/bird into int-new-channels

Browse source
This commit is contained in:
Jan Moskyto Matejka 2016-04-07 09:58:31 +02:00
commit 0c8c8151fc
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/conf.c
View file

@ -504,7 +504,7 @@ order_shutdown(void)
* error in the configuration. * error in the configuration.
*/ */
void void
cf_error(char *msg, ...) cf_error(const char *msg, ...)
{ {
char buf[1024]; char buf[1024];
va_list args; va_list args;

2
conf/conf.h
View file

@ -68,7 +68,7 @@ int config_commit(struct config *, int type, int timeout);
int config_confirm(void); int config_confirm(void);
int config_undo(void); int config_undo(void);
void config_init(void); void config_init(void);
void cf_error(char *msg, ...) NORET; void cf_error(const char *msg, ...) NORET;
void config_add_obstacle(struct config *); void config_add_obstacle(struct config *);
void config_del_obstacle(struct config *); void config_del_obstacle(struct config *);
void order_shutdown(void); void order_shutdown(void);

8
nest/proto.c
View file

@ -39,6 +39,12 @@ static int graceful_restart_state;
static u32 graceful_restart_locks; static u32 graceful_restart_locks;
static char *p_states[] = { "DOWN", "START", "UP", "STOP" }; 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; extern struct protocol proto_unix_iface;
@ -313,7 +319,7 @@ channel_set_state(struct channel *c, uint state)
uint cs = c->channel_state; uint cs = c->channel_state;
uint es = c->export_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) if (state == cs)
return; return;

2
nest/rt-dev.c
View file

@ -34,7 +34,7 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad)
if (!EMPTY_LIST(cf->iface_list) && if (!EMPTY_LIST(cf->iface_list) &&
!iface_patt_find(&cf->iface_list, ad->iface, ad->iface->addr)) !iface_patt_find(&cf->iface_list, ad->iface, ad->iface->addr))
/* Empty list is automagically treated as "*" */ /* Empty list is automatically treated as "*" */
return; return;
if (ad->flags & IA_SECONDARY) if (ad->flags & IA_SECONDARY)