Commit 1dea356a authored by Pavel Tvrdik's avatar Pavel Tvrdik
Browse files

Merge branch 'master' into mrtdump

parents 36ddc3f1 06edbb67

client/commands.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ cmd_build_tree(void) 
	      new->plastson = &new->son;

	      new->len = c-d;

	      memcpy(new->token, d, c-d);

	      new->prio = (new->len == 3 && !memcmp(new->token, "roa", 3)) ? 0 : 1; /* Hack */

	      new->prio = (new->len == 3 && (!memcmp(new->token, "roa", 3) || !memcmp(new->token, "rip", 3))) ? 0 : 1; /* Hack */

	    }

	  old = new;

	  while (isspace(*c))

conf/cf-lex.l

+43 −21
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ struct sym_scope { 
static struct sym_scope *conf_this_scope;



static int cf_hash(byte *c);

static struct symbol *cf_find_sym(byte *c, unsigned int h0);

static inline struct symbol * cf_get_sym(byte *c, uint h0);



linpool *cfg_mem;
@@ -194,7 +194,7 @@ else: { 
	}

      k=k->next;

    }

  cf_lval.s = cf_find_sym(yytext, h);

  cf_lval.s = cf_get_sym(yytext, h);

  return SYM;

}
@@ -426,8 +426,9 @@ check_eof(void) 
}



static struct symbol *

cf_new_sym(byte *c, unsigned int h)

cf_new_sym(byte *c, uint h0)

{

  uint h = h0 & (SYM_HASH_SIZE-1);

  struct symbol *s, **ht;

  int l;
@@ -449,56 +450,77 @@ cf_new_sym(byte *c, unsigned int h) 
}



static struct symbol *

cf_find_sym(byte *c, unsigned int h0)

cf_find_sym(struct config *cfg, byte *c, uint h0)

{

  unsigned int h = h0 & (SYM_HASH_SIZE-1);

  uint h = h0 & (SYM_HASH_SIZE-1);

  struct symbol *s, **ht;



  if (ht = new_config->sym_hash)

  if (ht = cfg->sym_hash)

    {

      for(s = ht[h]; s; s=s->next)

	if (!strcmp(s->name, c) && s->scope->active)

	  return s;

    }

  if (new_config->sym_fallback)

  if (ht = cfg->sym_fallback)

    {

      /* We know only top-level scope is active */

      for(s = new_config->sym_fallback[h]; s; s=s->next)

      for(s = ht[h]; s; s=s->next)

	if (!strcmp(s->name, c) && s->scope->active)

	  return s;

    }

  return cf_new_sym(c, h);



  return NULL;

}



static inline struct symbol *

cf_get_sym(byte *c, uint h0)

{

  return cf_find_sym(new_config, c, h0) ?: cf_new_sym(c, h0);

}



/**

 * cf_find_symbol - find a symbol by name

 * @cfg: specificed config

 * @c: symbol name

 *

 * This functions searches the symbol table for a symbol of given

 * name. First it examines the current scope, then the second recent

 * one and so on until it either finds the symbol and returns a pointer

 * to its &symbol structure or reaches the end of the scope chain

 * and returns %NULL to signify no match.

 * This functions searches the symbol table in the config @cfg for a symbol of

 * given name. First it examines the current scope, then the second recent one

 * and so on until it either finds the symbol and returns a pointer to its

 * &symbol structure or reaches the end of the scope chain and returns %NULL to

 * signify no match.

 */

struct symbol *

cf_find_symbol(byte *c)

cf_find_symbol(struct config *cfg, byte *c)

{

  return cf_find_sym(c, cf_hash(c));

  return cf_find_sym(cfg, c, cf_hash(c));

}



/**

 * cf_get_symbol - get a symbol by name

 * @c: symbol name

 *

 * This functions searches the symbol table of the currently parsed config

 * (@new_config) for a symbol of given name. It returns either the already

 * existing symbol or a newly allocated undefined (%SYM_VOID) symbol if no

 * existing symbol is found.

 */

struct symbol *

cf_get_symbol(byte *c)

{

  return cf_get_sym(c, cf_hash(c));

}



struct symbol *

cf_default_name(char *template, int *counter)

{

  char buf[32];

  char buf[SYM_MAX_LEN];

  struct symbol *s;

  char *perc = strchr(template, '%');



  for(;;)

    {

      bsprintf(buf, template, ++(*counter));

      s = cf_find_sym(buf, cf_hash(buf));

      if (!s)

	break;

      s = cf_get_sym(buf, cf_hash(buf));

      if (s->class == SYM_VOID)

	return s;

      if (!perc)
@@ -529,7 +551,7 @@ cf_define_symbol(struct symbol *sym, int type, void *def) 
    {

      if (sym->scope == conf_this_scope)

	cf_error("Symbol already defined");

      sym = cf_new_sym(sym->name, cf_hash(sym->name) & (SYM_HASH_SIZE-1));

      sym = cf_new_sym(sym->name, cf_hash(sym->name));

    }

  sym->class = type;

  sym->def = def;

conf/conf.c

+39 −26
Original line number Diff line number Diff line
@@ -20,19 +20,19 @@ 
 *

 * There can exist up to four different configurations at one time: an active

 * one (pointed to by @config), configuration we are just switching from

 * (@old_config), one queued for the next reconfiguration (@future_config;

 * if there is one and the user wants to reconfigure once again, we just

 * free the previous queued config and replace it with the new one) and

 * finally a config being parsed (@new_config). The stored @old_config 

 * is also used for undo reconfiguration, which works in a similar way.

 * Reconfiguration could also have timeout (using @config_timer) and undo

 * is automatically called if the new configuration is not confirmed later.

 * (@old_config), one queued for the next reconfiguration (@future_config; if

 * there is one and the user wants to reconfigure once again, we just free the

 * previous queued config and replace it with the new one) and finally a config

 * being parsed (@new_config). The stored @old_config is also used for undo

 * reconfiguration, which works in a similar way. Reconfiguration could also

 * have timeout (using @config_timer) and undo is automatically called if the

 * new configuration is not confirmed later. The new config (@new_config) and

 * associated linear pool (@cfg_mem) is non-NULL only during parsing.

 *

 * Loading of new configuration is very simple: just call config_alloc()

 * to get a new &config structure, then use config_parse() to parse a

 * configuration file and fill all fields of the structure

 * and finally ask the config manager to switch to the new

 * config by calling config_commit().

 * Loading of new configuration is very simple: just call config_alloc() to get

 * a new &config structure, then use config_parse() to parse a configuration

 * file and fill all fields of the structure and finally ask the config manager

 * to switch to the new config by calling config_commit().

 *

 * CLI commands are parsed in a very similar way -- there is also a stripped-down

 * &config structure associated with them and they are lex-ed and parsed by the
@@ -92,10 +92,15 @@ config_alloc(byte *name) 
  linpool *l = lp_new(p, 4080);

  struct config *c = lp_allocz(l, sizeof(struct config));



  /* Duplication of name string in local linear pool */

  uint nlen = strlen(name) + 1;

  char *ndup = lp_allocu(l, nlen);

  memcpy(ndup, name, nlen);



  c->mrt_proto_file = -1; 		/* Indication that the file descriptor should not be used */

  c->pool = p;

  cfg_mem = c->mem = l;

  c->file_name = cfg_strdup(name);

  c->mem = l;

  c->file_name = ndup;

  c->load_time = now;

  c->tf_route = c->tf_proto = (struct timeformat){"%T", "%F", 20*3600};

  c->tf_base = c->tf_log = (struct timeformat){"%F %T", NULL, 0};
@@ -120,11 +125,13 @@ config_alloc(byte *name) 
int

config_parse(struct config *c)

{

  int done = 0;

  DBG("Parsing configuration file `%s'\n", c->file_name);

  new_config = c;

  cfg_mem = c->mem;

  if (setjmp(conf_jmpbuf))

    return 0;

    goto cleanup;



  cf_lex_init(0, c);

  sysdep_preconfig(c);

  protos_preconfig(c);
@@ -138,7 +145,12 @@ config_parse(struct config *c) 
  if (!c->router_id)

    cf_error("Router ID must be configured manually on IPv6 routers");

#endif

  return 1;

  done = 1;



cleanup:

  new_config = NULL;

  cfg_mem = NULL;

  return done;

}



/**
@@ -151,14 +163,22 @@ config_parse(struct config *c) 
int

cli_parse(struct config *c)

{

  new_config = c;

  int done = 0;

  c->sym_fallback = config->sym_hash;

  new_config = c;

  cfg_mem = c->mem;

  if (setjmp(conf_jmpbuf))

    return 0;

    goto cleanup;



  cf_lex_init(1, c);

  cf_parse();

  return 1;

  done = 1;



cleanup:

  c->sym_fallback = NULL;

  new_config = NULL;

  cfg_mem = NULL;

  return done;

}



/**
@@ -238,10 +258,6 @@ config_do_commit(struct config *c, int type) 
  if (old_config && !config->shutdown)

    log(L_INFO "Reconfiguring");



  /* This should not be necessary, but it seems there are some

     functions that access new_config instead of config */

  new_config = config;



  if (old_config)

    old_config->obstacle_count++;
@@ -255,9 +271,6 @@ config_do_commit(struct config *c, int type) 
  DBG("protos_commit\n");

  protos_commit(c, old_config, force_restart, type);



  /* Just to be sure nobody uses that now */

  new_config = NULL;



  int obs = 0;

  if (old_config)

    obs = --old_config->obstacle_count;

conf/conf.h

+3 −1
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ int cf_lex(void); 
void cf_lex_init(int is_cli, struct config *c);

void cf_lex_unwind(void);



struct symbol *cf_find_symbol(byte *c);

struct symbol *cf_find_symbol(struct config *cfg, byte *c);



struct symbol *cf_get_symbol(byte *c);

struct symbol *cf_default_name(char *template, int *counter);

struct symbol *cf_define_symbol(struct symbol *symbol, int type, void *def);

void cf_push_scope(struct symbol *);

configure.in

+6 −6
Original line number Diff line number Diff line
@@ -85,12 +85,12 @@ if test -z "$GCC" ; then 
fi



# Enable threads by default just in Linux and FreeBSD

if test "$enable_pthreads" = try ; then

	case "$host_os" in

		(linux* | freebsd*)	enable_pthreads=try ;;

		(*)			enable_pthreads=no ;;

	esac

fi

#if test "$enable_pthreads" = try ; then

#	case "$host_os" in

#		(linux* | freebsd* | openbsd* | netbsd* )	enable_pthreads=try ;;

#		(*)				enable_pthreads=no ;;

#	esac

#fi



if test "$enable_pthreads" != no ; then

	BIRD_CHECK_PTHREADS

CRA Git | Maintained and supported by SUSTech CRA and CCSE