Revision 26822d8f proto/bgp/bgp.c

View differences:

proto/bgp/bgp.c
955 955
  if (internal && c->rs_client)
956 956
    cf_error("Only external neighbor can be RS client");
957 957

  
958
  /*
958

  
959 959
  if (c->multihop && (c->gw_mode == GW_DIRECT))
960 960
    cf_error("Multihop BGP cannot use direct gateway mode");
961 961

  
962 962
  if (c->multihop && (ipa_has_link_scope(c->remote_ip) || 
963 963
		      ipa_has_link_scope(c->source_addr)))
964 964
    cf_error("Multihop BGP cannot be used with link-local addresses");
965
  */
965

  
966 966

  
967 967
  /* Different default based on rs_client */
968 968
  if (!c->missing_lladdr)
......
970 970

  
971 971
  /* Different default for gw_mode */
972 972
  if (!c->gw_mode)
973
    // c->gw_mode = (c->multihop || internal) ? GW_RECURSIVE : GW_DIRECT;
974
    c->gw_mode = GW_DIRECT;
973
    c->gw_mode = (c->multihop || internal) ? GW_RECURSIVE : GW_DIRECT;
974

  
975

  
976
  if ((c->gw_mode == GW_RECURSIVE) && c->c.table->sorted)
977
    cf_error("BGP in recursive mode prohibits sorted table");
978

  
979
  if (c->deterministic_med && c->c.table->sorted)
980
    cf_error("BGP with deterministic MED prohibits sorted table");
981

  
982
  if (c->secondary && !c->c.table->sorted)
983
    cf_error("BGP with secondary option requires sorted table");
975 984
}
976 985

  
977 986
static int

Also available in: Unified diff