Revision 5400c0e7

View differences:

doc/bird.sgml
477 477
	problems in details of its behavior -- the number of exported
478 478
	routes can temporarily exceed the limit without triggering it
479 479
	during protocol reload, exported routes counter ignores route
480
	blocking and block action also blocks route updates of alread
480
	blocking and block action also blocks route updates of already
481 481
	accepted routes -- and these details will probably change in
482 482
	the future. Default: <cf/none/.
483 483

  
nest/proto.c
512 512
	      else if (!p->disabled && nc->disabled)
513 513
		log(L_INFO "Disabling protocol %s", p->name);
514 514

  
515
	      PD(p, "Restarting");
516 515
	      p->down_code = nc->disabled ? PDC_CF_DISABLE : PDC_CF_RESTART;
517 516
	      p->cf_new = nc;
518 517
	    }
519
	  else
518
	  else if (!shutting_down)
520 519
	    {
521
	      if (!shutting_down)
522
		log(L_INFO "Removing protocol %s", p->name);
523
	      PD(p, "Unconfigured");
520
	      log(L_INFO "Removing protocol %s", p->name);
524 521
	      p->down_code = PDC_CF_REMOVE;
525 522
	      p->cf_new = NULL;
526 523
	    }
527
	  p->reconfiguring = 1;
524
	  else /* global shutdown */
525
	    {
526
	      p->down_code = PDC_CMD_SHUTDOWN;
527
	      p->cf_new = NULL;
528
	    }
528 529

  
530
	  p->reconfiguring = 1;
529 531
	  config_add_obstacle(old);
530 532
	  proto_rethink_goal(p);
531 533
	}
nest/protocol.h
222 222
#define PDC_CF_RESTART		0x03	/* Restart due to reconfiguration */
223 223
#define PDC_CMD_DISABLE		0x11	/* Result of disable command */
224 224
#define PDC_CMD_RESTART		0x12	/* Result of restart command */
225
#define PDC_CMD_SHUTDOWN	0x13	/* Result of global shutdown */
225 226
#define PDC_IN_LIMIT_HIT	0x21	/* Route import limit reached */
226
#define PDC_OUT_LIMIT_HIT	0x22	/* Route export limit reached - not implemented */
227
#define PDC_OUT_LIMIT_HIT	0x22	/* Route export limit reached */
227 228

  
228 229

  
229 230
void *proto_new(struct proto_config *, unsigned size);
proto/bgp/bgp.c
870 870
      break;
871 871

  
872 872
    case PDC_CMD_DISABLE:
873
    case PDC_CMD_SHUTDOWN:
873 874
      subcode = 2; // Errcode 6, 2 - administrative shutdown
874 875
      break;
875 876

  

Also available in: Unified diff