mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-22 14:27:03 +00:00
Code Releases Activity

Merge commit '13c6cf8a7430a6b133e46525256eb5554b3f0a2b' into thread-next

Browse Source
This commit is contained in:
Maria Matejka 2024-01-28 23:09:47 +01:00
commit d615633437
6 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proto/bfd/bfd.c
View File

@ -143,7 +143,7 @@ bfd_merge_options(const struct bfd_iface_config *cf, const struct bfd_options *o
.min_tx_int = opts->min_tx_int ?: cf->min_tx_int,
.idle_tx_int = opts->idle_tx_int ?: cf->idle_tx_int,
.multiplier = opts->multiplier ?: cf->multiplier,
.passive = opts->passive_set ? opts->passive : cf->passive
.passive = opts->passive_set ? opts->passive : cf->passive,
};
}
@ -553,7 +553,7 @@ static struct bfd_iface_config bfd_default_iface = {
.min_rx_int = BFD_DEFAULT_MIN_RX_INT,
.min_tx_int = BFD_DEFAULT_MIN_TX_INT,
.idle_tx_int = BFD_DEFAULT_IDLE_TX_INT,
.multiplier = BFD_DEFAULT_MULTIPLIER
.multiplier = BFD_DEFAULT_MULTIPLIER,
};
static inline struct bfd_iface_config *
@ -903,7 +903,7 @@ static struct resclass bfd_request_class = {
bfd_request_free,
bfd_request_dump,
NULL,
NULL
NULL,
};

4
proto/ospf/lsalib.h
View File

@ -16,8 +16,8 @@ static inline void lsa_hton_hdr(struct ospf_lsa_header *h, struct ospf_lsa_heade
static inline void lsa_ntoh_hdr(struct ospf_lsa_header *n, struct ospf_lsa_header *h) { *h = *n; };
static inline void lsa_hton_body(void *h, void *n, u16 len) { ASSERT(h != n); memcpy(n, h, len); };
static inline void lsa_ntoh_body(void *n, void *h, u16 len) { ASSERT(n != h); memcpy(h, n, len); };
static inline void lsa_hton_body1(void *h, u16 len) { };
static inline void lsa_ntoh_body1(void *n, u16 len) { };
static inline void lsa_hton_body1(void *h UNUSED, u16 len UNUSED) { };
static inline void lsa_ntoh_body1(void *n UNUSED, u16 len UNUSED) { };
#else
void lsa_hton_hdr(struct ospf_lsa_header *h, struct ospf_lsa_header *n);
void lsa_ntoh_hdr(struct ospf_lsa_header *n, struct ospf_lsa_header *h);

1
proto/rip/rip.c
View File

@ -77,6 +77,7 @@
*/
#include <stdlib.h>
#include "rip.h"
#include "lib/macro.h"