- Bird-users - Mailing Lists

simple patch for RIPng
by Goesta Smekal 21 Jan '12

21 Jan '12

Dear List, as I stated earlier last November, there are some simple issues, which prevent RIPng (aka IPv6 RIP) from working. Despite my rather basic knowledge of C I endeavoured to try and fix it. So far, two things are fixed by my patch: the UDP port is set to 521 (instead of 520 for IPv4 RIP) and the version number set to 1. At least the protocol dissector of wireshark now accepts the packets as correct RIPng messages (instead of "unknown protocol"). Anyway, my virtualized test setup does not yet exchange routes. This may as well be due to an error in my setup. Feedback is very appreciated ... Goesta -- #!/usr/bin/perl foreach $c (split(/ /,"47 6f 65 73 74 61 20 53 6d 65 6b 61 6c 0d 0a")) { print pack("C", hex($c));}

1 0

BSD and carp take 2
by fredrik danerklint 20 Jan '12

20 Jan '12

Hi. I've made an patch that I would like to know if this is how it should be done. What I want to achieve is to only announce a carp interface if it is in the master state. Otherwise ignore it. Hopefully someone else is in the master state and do the announcement in that case. -- //fredan

3 4

VRRP Question
by dspazman＠epicup.com 20 Jan '12

20 Jan '12

Hi there. I have started selling bandwidth in a data center, using bird as my main router, and it's working well. I need to put in a redundant router though, and so was starting to look into that. I'm just curious if there are any special considerations / examples of setting up VRRP on a bird router running BGP / BGPv6?

2 1

[PATCH 1/1] * Handle interface removal and renaming correctly on BSD
by Alexander V. Chernikov 19 Jan '12

19 Jan '12

--- nest/iface.c | 44 ++++++++++++++++++++++++++++++++++ nest/iface.h | 1 + proto/ospf/iface.c | 9 +++++++ sysdep/bsd/krt-sock.c | 60 +++++++++++++++++++++++++++++++++++++++++++++- sysdep/unix/krt-iface.c | 13 +++++++--- 5 files changed, 121 insertions(+), 6 deletions(-) diff --git a/nest/iface.c b/nest/iface.c index b8b214e..4dae928 100644 --- a/nest/iface.c +++ b/nest/iface.c @@ -127,6 +127,10 @@ if_what_changed(struct iface *i, struct iface *j) c |= IF_CHANGE_LINK; if (i->mtu != j->mtu) c |= IF_CHANGE_MTU; + if (strcmp(i->name, j->name)) + c |= IF_CHANGE_NAME; + + log(L_ERR "Interface %s changed: %X", i->name, c); return c; } @@ -179,6 +183,7 @@ if_send_notify(struct proto *p, unsigned c, struct iface *i) (c & IF_CHANGE_UP) ? "goes up" : (c & IF_CHANGE_DOWN) ? "goes down" : (c & IF_CHANGE_MTU) ? "changes MTU" : + (c & IF_CHANGE_NAME) ? "changes name" : (c & IF_CHANGE_LINK) ? "changes link" : (c & IF_CHANGE_CREATE) ? "created" : "sends unknown event"); @@ -253,6 +258,40 @@ if_change_flags(struct iface *i, unsigned flags) } /** + * if_destroy - destroy given interface + * @i: interface to be removed + */ +static void +if_destroy(struct iface *i) +{ + struct ifa *a, *a_next; + + i->flags &= ~IF_UP; + i->flags |= IF_TMP_DOWN; + if_notify_change(IF_CHANGE_DOWN, i); + + /* + * all protocols are notified about ifa's going down (sockets became invalid) + * neighbor cache is cleared for this itnerface + */ + + /* Remove all addresses */ + WALK_LIST_DELSAFE(a, a_next, i->addrs) + mb_free(a); + + rem_node(&i->n); + + if (!EMPTY_LIST(i->neighbors)) + { + log(L_ERR "Error: neighbors cache for interface %s is not empty", i->name); + memset(i, 0, sizeof(struct iface)); + return; + } + + mb_free(i); +} + +/** * if_update - update interface status * @new: new interface status * @@ -282,6 +321,11 @@ if_update(struct iface *new) c = if_what_changed(i, new); if (c & IF_CHANGE_TOO_MUCH) /* Changed a lot, convert it to down/up */ { + if (new->flags & IF_SHUTDOWN) + { + if_destroy(i); + return NULL; + } DBG("Interface %s changed too much -- forcing down/up transition\n", i->name); if_change_flags(i, i->flags | IF_TMP_DOWN); rem_node(&i->n); diff --git a/nest/iface.h b/nest/iface.h index d6d58ff..cadf5c9 100644 --- a/nest/iface.h +++ b/nest/iface.h @@ -79,6 +79,7 @@ struct iface { #define IF_CHANGE_MTU 4 #define IF_CHANGE_CREATE 8 /* Seen this interface for the first time */ #define IF_CHANGE_LINK 0x10 +#define IF_CHANGE_NAME 0x20 /* Interface is renamed */ #define IF_CHANGE_TOO_MUCH 0x40000000 /* Used internally */ void if_init(void); diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index cced710..73f44c1 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -1025,6 +1025,12 @@ ospf_ifaces_reconfigure(struct ospf_area *oa, struct ospf_area_config *nac) #endif static void +ospf_iface_rename(struct proto_ospf *po, struct iface *iface) +{ +} + + +static void ospf_iface_change_mtu(struct proto_ospf *po, struct ospf_iface *ifa) { struct proto *p = &po->proto; @@ -1081,6 +1087,9 @@ ospf_if_notify(struct proto *p, unsigned flags, struct iface *iface) if (flags & IF_CHANGE_UP) return; + if (flags & IF_CHANGE_NAME) + ospf_iface_rename(po, iface); + struct ospf_iface *ifa, *ifx; WALK_LIST_DELSAFE(ifa, ifx, po->iface_list) if ((ifa->type != OSPF_IT_VLINK) && (ifa->iface == iface)) diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c index 4bf6600..9371e21 100644 --- a/sysdep/bsd/krt-sock.c +++ b/sysdep/bsd/krt-sock.c @@ -276,7 +276,7 @@ krt_read_rt(struct ks_msg *msg, struct krt_proto *p, int scan) if (sa_family_check(&dst)) get_sockaddr(&dst, &idst, NULL, NULL, 0); else - SKIP("invalid DST"); + SKIP("invalid DST\n"); /* We will check later whether we have valid gateway addr */ if (sa_family_check(&gate)) @@ -410,6 +410,60 @@ krt_read_rt(struct ks_msg *msg, struct krt_proto *p, int scan) } static void +krt_read_ifannounce(struct ks_msg *msg) +{ + struct iface *iface, f; + struct if_announcemsghdr *ifam = (struct if_announcemsghdr *)&msg->rtm; + + iface = if_find_by_index(ifam->ifan_index); + + if (ifam->ifan_what == IFAN_DEPARTURE) + { + /* Interface is destroyed */ + if (!iface) + { + DBG("KRT: unknown interface (%s, #%d) going down. Ignoring\n", ifam->ifan_name, ifam->ifan_index); + return; + } + + /* + * If interface is still up this means interface is renamed. Do nothing + * and update interface name on interface arrival event + */ + if (iface->flags & IF_UP) + return; + + /* Prepare fake structure without IF_UP flag */ + bzero(&f, sizeof(f)); + f.index = ifam->ifan_index; + f.flags = IF_SHUTDOWN; + memcpy(f.name, ifam->ifan_name, sizeof(f.name) - 1); + + if_update(&f); + return; + } + + if (ifam->ifan_what == IFAN_ARRIVAL) + { + /* New interface. Check if it already exists */ + if (!iface) + return; + + /* Interface is renamed. */ + if (strcmp(iface->name, ifam->ifan_name)) + { + DBG("KRT: Interface %s renamed to %s\n", iface->name, ifam->ifan_name); + memcpy(&f, iface, sizeof(struct iface)); + /* Assume both strings are IFNAMSIZ length */ + memcpy(f.name, ifam->ifan_name, IFNAMSIZ); + if_update(&f); + } + } + + DBG("KRT: IFANNOUNCE what: %d index %d name %s\n", ifam->ifan_what, ifam->ifan_index, ifam->ifan_name); +} + +static void krt_read_ifinfo(struct ks_msg *msg) { struct if_msghdr *ifm = (struct if_msghdr *)&msg->rtm; @@ -448,7 +502,7 @@ krt_read_ifinfo(struct ks_msg *msg) bzero(&f, sizeof(f)); f.index = ifm->ifm_index; memcpy(f.name, dl->sdl_data, MIN(sizeof(f.name)-1, dl->sdl_nlen)); - DBG("New interface '%s' found", f.name); + DBG("New interface '%s' found\n", f.name); } else { @@ -588,6 +642,8 @@ krt_read_msg(struct proto *p, struct ks_msg *msg, int scan) case RTM_DELETE: krt_read_rt(msg, (struct krt_proto *)p, scan); break; + case RTM_IFANNOUNCE: + krt_read_ifannounce(msg); case RTM_IFINFO: krt_read_ifinfo(msg); break; diff --git a/sysdep/unix/krt-iface.c b/sysdep/unix/krt-iface.c index 69048ae..0866e08 100644 --- a/sysdep/unix/krt-iface.c +++ b/sysdep/unix/krt-iface.c @@ -177,10 +177,15 @@ scan_ifs(struct ifreq *r, int cnt) a.flags |= IA_SECONDARY; pi = if_find_by_index(i.index); } - if (!pi) - pi = if_update(&i); - a.iface = pi; - ifa_update(&a); + if ((!pi) && (pi = if_update(&i))) + { + /* + * if_update() CAN return NULL for updates + * with IF_SHUTDOWN flag + */ + a.iface = pi; + ifa_update(&a); + } } if_end_update(); } -- 1.7.3.2 --------------050303070709040602030009--

1 0

OSPF & cost
by Peter Andreev 19 Jan '12

19 Jan '12

Hello, everybody! I'm trying to setup bird 1.3.4 ospfv2 as following: protocol ospf OSPFtest { area 192.168.1.1 { stub yes; interface "igb1" { }; interface "lo1" { cost 30; }; interface "lo3" { cost 30; }; }; }; All works good and I see lo1, lo3 addresses on neighbours but with path-costs equal to 0. What should I do to fix this problem? Thanks in advance! -- -- AP

2 4

[PATCH 2/2] Added support for carp validation on BSD
by Fredrik Danerklint 18 Jan '12

18 Jan '12

--- sysdep/bsd/Modules | 1 + sysdep/bsd/krt-sock.c | 10 ++++++++-- sysdep/bsd/krt-sock.h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sysdep/bsd/Modules b/sysdep/bsd/Modules index 84abffd..5af82ee 100644 --- a/sysdep/bsd/Modules +++ b/sysdep/bsd/Modules @@ -4,3 +4,4 @@ sysio.h krt-set.h krt-sock.c krt-sock.h +check_carp.c diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c index 4bf6600..671c96f 100644 --- a/sysdep/bsd/krt-sock.c +++ b/sysdep/bsd/krt-sock.c @@ -458,8 +458,14 @@ krt_read_ifinfo(struct ks_msg *msg) f.mtu = ifm->ifm_data.ifi_mtu; f.flags = 0; - if (fl & IFF_UP) - f.flags |= IF_ADMIN_UP; + int carp = check_carp(f.name, strlen(f.name)); + if (carp < 0) //no carp interface + if (fl & IFF_UP) + f.flags |= IF_ADMIN_UP; + else + if (fl & IFF_UP && carp == 2) // (interface) carp is master and only then should the interface be up. + f.flags |= IF_ADMIN_UP; + if (ifm->ifm_data.ifi_link_state != LINK_STATE_DOWN) f.flags |= IF_LINK_UP; /* up or unknown */ if (fl & IFF_LOOPBACK) /* Loopback */ diff --git a/sysdep/bsd/krt-sock.h b/sysdep/bsd/krt-sock.h index aab639c..d836709 100644 --- a/sysdep/bsd/krt-sock.h +++ b/sysdep/bsd/krt-sock.h @@ -39,4 +39,6 @@ static inline void krt_set_copy_params(struct krt_set_params *d UNUSED, struct k void krt_read_msg(struct proto *p, struct ks_msg *msg, int scan); +int check_carp(const char *name, int namelen); + #endif -- 1.7.3.5 --------------010500000801000408070709--

1 0

[PATCH 1/2] Added support for carp validation on BSD
by Fredrik Danerklint 18 Jan '12

18 Jan '12

--- sysdep/bsd/check_carp.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) create mode 100644 sysdep/bsd/check_carp.c diff --git a/sysdep/bsd/check_carp.c b/sysdep/bsd/check_carp.c new file mode 100644 index 0000000..f6df437 --- /dev/null +++ b/sysdep/bsd/check_carp.c @@ -0,0 +1,102 @@ +/* $FreeBSD: src/sbin/ifconfig/ifcarp.c,v 1.2.24.2 2010/02/07 06:22:28 ru Exp $ */ +/* from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */ + +/* + * Copyright (c) 2002 Michael Shalayeff. All rights reserved. + * Copyright (c) 2003 Ryan McBride. All rights reserved. + * Copyright (c) 1983, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * This was ifconfig.c and if_carp.c from FreeBSD 8.2. + * Modified to only return the state of an carp interface if there is any. + * Will return an 0 (zero) or greater if the interface is an carp interface + * and it is configured. Otherwise it returns an negativ number. + * This file should be possible to compile standalone with: + * 'gcc check_carp.c -o check_carp' + * without the if 0 in this source file. + */ + +#include <sys/ioctl.h> +#include <sys/socket.h> +#include <net/if.h> +#include <netinet/ip_carp.h> +#include <stdio.h> +#include <string.h> + +int check_carp(const char *name, int namelen) { + static struct ifreq ifr; + + if (namelen > sizeof(ifr.ifr_name)) + return -4; + + memset(ifr.ifr_name, 0, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, name, namelen); + + ifr.ifr_addr.sa_family = AF_LOCAL; + + int s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0); + if (s < 0) { +// err(1, "socket(family %u,SOCK_DGRAM)", ifr.ifr_addr.sa_family); + return -3; + } + + struct carpreq carpr; + + memset((char *)&carpr, 0, sizeof(struct carpreq)); + ifr.ifr_data = (caddr_t)&carpr; + + if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1) + return -2; + +#if 0 + fprintf(stderr, "carpr.carpr_vhid = %i \n", carpr.carpr_vhid); +#endif + +/* + carpr_state will/should return: + "INIT" == 0 + "BACKUP" == 1 + "MASTER" == 2 +*/ + if (carpr.carpr_vhid > 0) + return carpr.carpr_state; + else + return -1; +} + +#if 0 +int main(int argc, char **argv) { + int rc = check_carp("carp0", 5); + + printf("check_carp = %i\n", rc); + + return 0; +} +#endif + -- 1.7.3.5 --------------010500000801000408070709 Content-Type: text/x-patch; name="0002-Added-support-for-carp-validation-on-BSD.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-Added-support-for-carp-validation-on-BSD.patch"

1 0

IEEE HPSR 2012 - Full paper submission extended
by Igor Maravić 18 Jan '12

18 Jan '12

********************************************************************************************************************* ********************************************************************************************************************* IEEE HPSR 2012 June 24-27 Belgrade Serbia http://www.ieee-hpsr.org Important Dates Full paper submission (extended): February 3, 2012 Tutorial submission: January 20, 2012 Acceptance notifications: March 20, 2012 Camera-ready due: April 15, 2012 IEEE Conference on High Performance Switching and Routing 2012 will be held in Belgrade, the capital of Serbia. Belgrade is a lively metropolis that is a blend of different cultures whose representatives were visiting at various points of history. As such, it is very well suited to host the IEEE HPSR conference that gathers scientists and engineers from the entire world, after Heidelberg, Dallas, Kobe, Torino, Arizona, Hong Kong, Poznan, New York, Shanghai, Paris, Dallas (again), and Cartagena. Internet traffic keeps growing thanks to the access technologies whose speeds are increasing at a fast pace, and thanks to many non-profit and commercial efforts to bridge the digital-divide by providing all the advantages of the Internet to developing countries as well. At the same time, challenging applications are gaining popularity on the Internet such as multimedia and P2P applications. Multimedia applications require a lot of bandwidth and low delays, while the traffic patterns of P2P applications are impossible to predict. IPv4 addresses are being exhausted at this very moment. Data centers are moving a vast amount of content through thousands of switches. Also, routers and switches are being attacked, and energy available for them, as for everything else, is decreasing. All these circumstances put a higher burden than ever on switching and routing. So, there is a lot of work to be done, and IEEE HPSR 2012 will do its part by addressing the following topics: Architectures of high-performance switches and routers High-speed packet processors Address lookup algorithms Packet classification, scheduling and dropping Switching, bridging and routing protocols Multicasting P2P routing Routing in wireless, mobile and sensor networks Optical switching and routing Switching, bridging and routing in data centers and clouds Data placement and migration Multiprocessor networks Network management Pricing, accounting and charging QoS and scalability of switching, bridging and routing Traffic characterization and engineering Power-aware switching, bridging and routing protocols High-speed network security Paper submission guidelines: Submitted papers must be unpublished, and cannot be submitted elsewhere at the same time. Accepted papers should not exceed 6 pages in two-column IEEE Transactions style (www.ieee.org) Accepted papers longer than 6 pages will be charged $100 for each extra page. Papers cannot be longer than 8 pages. Papers should be submitted as PDF files through the EDAS system (http://edas.info) All submitted papers will be subject to three independent reviews. Awards: The Best Paper Award will be granted based on the reviewers’ comments and scores that it received. Presentation of the paper will be scored by the audience, and will influence its final ranking. Note: In order to publish the paper at the IEEE HPSR 2012 proceedings and IEEE Xplore, the paper must be presented at the conference, and at least one of its authors should have a full registration. Non-refundable registration fees must be paid prior to uploading the final IEEE formatted, publication-ready, version of the paper. General Chairs: Aleksandra Smiljanić (Belgrade University, Serbia), Mounir Hamdi (Hong Kong University of Science and Technology, China) Technical Program Committee Chairs: Jonathan Chao (Polytechnic Institute of NYU, USA), Eiji Oki (University of Electro-Communications in Tokyo, Japan), Cyriel Minkenberg (IBM Research, Switzerland) Publicity Chairs: Andrea Bianco (Politecnico di Torino, Italy), Aleksandar Kolarov (Telcordia, USA), Dominique Verchere (Alcatel-Lucent, France) Registration and Finance Chair: Milan Bjelica (Belgrade University, Serbia) Publication Chair: Ljiljana Trajković (Simon Fraser University, Canada) Local Arrangement Chairs: Zoran Čiča, Nataša Maksić, and Marija Antić (Belgrade University, Serbia) Tutorials Chair: Dejan Kostić (EPFL, Switzerland), dejan.kostic(a)epfl.ch Panel Chair: Mitchell Gusat (IBM, Switzerland) Q&A: aleksandra(a)etf.rs, zoran.cica(a)etf.rs

1 0

Re: New release 1.3.5!
by Ebed 17 Jan '12

17 Jan '12

What about multipath device route ondrej? Is it already supported in version 1.3.5? It's definitely needed when you can only get dynamic ip. Look at this sample, route 0.0.0.0/0 multipath via "modem0" weight 1 via "modem1" weight 1 On 10/01/2012 21:56, Ondrej Filip wrote: > > Hi! > > A new version is ready! > > > > Changes: > > Version 1.3.5 > > o Protocol templates. > > o Deterministic MED option for BGP. > > o Support for link-local addresses in BGP and static protocols. > > o Several bugfixes. > > > > >

2 1

[PATCH 2/4] * Assign default protocol preference via proto_config_new()
by Alexander V. Chernikov 12 Jan '12

12 Jan '12

--- nest/config.Y | 1 - nest/proto.c | 1 + nest/protocol.h | 1 + nest/rt-dev.c | 1 + proto/bgp/bgp.c | 1 + proto/bgp/config.Y | 1 - proto/ospf/config.Y | 1 - proto/ospf/ospf.c | 1 + proto/pipe/config.Y | 1 - proto/pipe/pipe.c | 1 + proto/rip/rip.c | 2 +- proto/static/static.c | 2 +- sysdep/unix/krt.Y | 2 -- sysdep/unix/krt.c | 2 ++ 14 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nest/config.Y b/nest/config.Y index a6baf4e..3fcfa52 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -219,7 +219,6 @@ CF_ADDTO(proto, dev_proto '}') dev_proto_start: proto_start DIRECT { this_proto = proto_config_new(&proto_device, sizeof(struct rt_dev_config), $1); - this_proto->preference = DEF_PREF_DIRECT; init_list(&DIRECT_CFG->iface_list); } ; diff --git a/nest/proto.c b/nest/proto.c index d55c348..0fc72ce 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -200,6 +200,7 @@ proto_config_new(struct protocol *pr, unsigned size, int class) c->global = new_config; c->protocol = pr; c->name = pr->name; + c->preference = pr->preference; c->class = class; c->out_filter = FILTER_REJECT; c->table = c->global->master_rtc; diff --git a/nest/protocol.h b/nest/protocol.h index 3766e15..a83c4ff 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -39,6 +39,7 @@ struct protocol { char *template; /* Template for automatic generation of names */ int name_counter; /* Counter for automatic name generation */ int attr_class; /* Attribute class known to this protocol */ + unsigned preference; /* Default protocol preference */ void (*preconfig)(struct protocol *, struct config *); /* Just before configuring */ void (*postconfig)(struct proto_config *); /* After configuring each instance */ diff --git a/nest/rt-dev.c b/nest/rt-dev.c index 497ee80..54cb14b 100644 --- a/nest/rt-dev.c +++ b/nest/rt-dev.c @@ -109,6 +109,7 @@ dev_copy_config(struct proto_config *dest, struct proto_config *src) struct protocol proto_device = { name: "Direct", template: "direct%d", + preference: DEF_PREF_DIRECT, init: dev_init, reconfigure: dev_reconfigure, copy_config: dev_copy_config diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 66fdc60..4d3c32f 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -1178,6 +1178,7 @@ struct protocol proto_bgp = { name: "BGP", template: "bgp%d", attr_class: EAP_BGP, + preference: DEF_PREF_BGP, init: bgp_init, start: bgp_start, shutdown: bgp_shutdown, diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index 5fb6094..78ca52d 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -33,7 +33,6 @@ CF_ADDTO(proto, bgp_proto '}' { bgp_check_config(BGP_CFG); } ) bgp_proto_start: proto_start BGP { this_proto = proto_config_new(&proto_bgp, sizeof(struct bgp_config), $1); - this_proto->preference = DEF_PREF_BGP; BGP_CFG->hold_time = 240; BGP_CFG->connect_retry_time = 120; BGP_CFG->initial_hold_time = 240; diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 4ada41e..24e125a 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -129,7 +129,6 @@ CF_ADDTO(proto, ospf_proto '}' { ospf_proto_finish(); } ) ospf_proto_start: proto_start OSPF { this_proto = proto_config_new(&proto_ospf, sizeof(struct ospf_config), $1); - this_proto->preference = DEF_PREF_OSPF; init_list(&OSPF_CFG->area_list); init_list(&OSPF_CFG->vlink_list); OSPF_CFG->rfc1583 = DEFAULT_RFC1583; diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index ce7ad37..73c06c2 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -1542,6 +1542,7 @@ struct protocol proto_ospf = { name: "OSPF", template: "ospf%d", attr_class: EAP_OSPF, + preference: DEF_PREF_OSPF, init: ospf_init, dump: ospf_dump, start: ospf_start, diff --git a/proto/pipe/config.Y b/proto/pipe/config.Y index 4478afe..4063755 100644 --- a/proto/pipe/config.Y +++ b/proto/pipe/config.Y @@ -24,7 +24,6 @@ CF_ADDTO(proto, pipe_proto '}') pipe_proto_start: proto_start PIPE { this_proto = proto_config_new(&proto_pipe, sizeof(struct pipe_config), $1); - this_proto->preference = DEF_PREF_PIPE; PIPE_CFG->mode = PIPE_TRANSPARENT; } ; diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c index 420c5a9..fe8618b 100644 --- a/proto/pipe/pipe.c +++ b/proto/pipe/pipe.c @@ -197,6 +197,7 @@ pipe_get_status(struct proto *P, byte *buf) struct protocol proto_pipe = { name: "Pipe", template: "pipe%d", + preference: DEF_PREF_PIPE, postconfig: pipe_postconfig, init: pipe_init, start: pipe_start, diff --git a/proto/rip/rip.c b/proto/rip/rip.c index 543aa30..f0a4134 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -975,7 +975,6 @@ void rip_init_config(struct rip_proto_config *c) { init_list(&c->iface_list); - c->c.preference = DEF_PREF_RIP; c->infinity = 16; c->port = 520; c->period = 30; @@ -1032,6 +1031,7 @@ struct protocol proto_rip = { name: "RIP", template: "rip%d", attr_class: EAP_RIP, + preference: DEF_PREF_RIP, get_route_info: rip_get_route_info, get_attr: rip_get_attr, diff --git a/proto/static/static.c b/proto/static/static.c index f6c2a33..aaa9bfa 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -353,7 +353,6 @@ static_if_notify(struct proto *p, unsigned flags, struct iface *i) void static_init_config(struct static_config *c) { - c->c.preference = DEF_PREF_STATIC; init_list(&c->iface_routes); init_list(&c->other_routes); } @@ -523,6 +522,7 @@ static_copy_config(struct proto_config *dest, struct proto_config *src) struct protocol proto_static = { name: "Static", template: "static%d", + preference: DEF_PREF_STATIC, init: static_init, dump: static_dump, start: static_start, diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y index 8608196..18e1e52 100644 --- a/sysdep/unix/krt.Y +++ b/sysdep/unix/krt.Y @@ -31,7 +31,6 @@ kern_proto_start: proto_start KERNEL { cf_error("Kernel protocol already defined"); #endif cf_krt = this_proto = proto_config_new(&proto_unix_kernel, sizeof(struct krt_config), $1); - this_proto->preference = DEF_PREF_INHERITED; THIS_KRT->scan_time = 60; THIS_KRT->learn = THIS_KRT->persist = 0; krt_scan_construct(THIS_KRT); @@ -67,7 +66,6 @@ kif_proto_start: proto_start DEVICE { if (cf_kif) cf_error("Kernel device protocol already defined"); cf_kif = this_proto = proto_config_new(&proto_unix_iface, sizeof(struct kif_config), $1); - this_proto->preference = DEF_PREF_DIRECT; THIS_KIF->scan_time = 60; init_list(&THIS_KIF->primary); krt_if_construct(THIS_KIF); diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index e5a8ce1..c4886c9 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -236,6 +236,7 @@ kif_copy_config(struct proto_config *dest, struct proto_config *src) struct protocol proto_unix_iface = { name: "Device", template: "device%d", + preference: DEF_PREF_DIRECT, preconfig: kif_preconfig, init: kif_init, start: kif_start, @@ -961,6 +962,7 @@ struct protocol proto_unix_kernel = { name: "Kernel", template: "kernel%d", attr_class: EAP_KRT, + preference: DEF_PREF_INHERITED, preconfig: krt_preconfig, postconfig: krt_postconfig, init: krt_init, -- 1.7.3.2 --------------020905020108020403060403--

1 0