diff --git a/sysdep/bsd/krt-iface.h b/sysdep/bsd/krt-iface.h index aa2eb857..7d96fe88 100644 --- a/sysdep/bsd/krt-iface.h +++ b/sysdep/bsd/krt-iface.h @@ -12,6 +12,6 @@ /* * We don't have split iface/scan/set parts. See krt-sock.h. */ -static inline int kif_params_same(struct krt_if_params *old, struct krt_if_params *new) { return 1; } +static inline int kif_params_same(struct krt_if_params *old UNUSED, struct krt_if_params *new UNUSED) { return 1; } #endif diff --git a/sysdep/bsd/krt-scan.h b/sysdep/bsd/krt-scan.h index e06f57f3..284df5ea 100644 --- a/sysdep/bsd/krt-scan.h +++ b/sysdep/bsd/krt-scan.h @@ -16,6 +16,6 @@ struct krt_scan_status { list temp_ifs; /* Temporary interfaces */ }; -static inline int krt_scan_params_same(struct krt_scan_params *o, struct krt_scan_params *n) { return 1; } +static inline int krt_scan_params_same(struct krt_scan_params *o UNUSED, struct krt_scan_params *n UNUSED) { return 1; } #endif diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c index 7f0db348..b315d5a3 100644 --- a/sysdep/bsd/krt-sock.c +++ b/sysdep/bsd/krt-sock.c @@ -203,7 +203,7 @@ krt_sock_send(int cmd, rte *e) } void -krt_set_notify(struct krt_proto *p, net *net, rte *new, rte *old) +krt_set_notify(struct krt_proto *p UNUSED, net *net UNUSED, rte *new, rte *old) { if (old) { @@ -218,7 +218,7 @@ krt_set_notify(struct krt_proto *p, net *net, rte *new, rte *old) } void -krt_set_start(struct krt_proto *x, int first) +krt_set_start(struct krt_proto *x, int first UNUSED) { sock *sk_rt; static int ks_open_tried = 0; @@ -243,7 +243,7 @@ krt_set_start(struct krt_proto *x, int first) } static int -krt_set_hook(sock *sk, int size) +krt_set_hook(sock *sk, int size UNUSED) { struct ks_msg msg; int l = read(sk->fd, (char *)&msg, sizeof(msg)); @@ -548,28 +548,28 @@ krt_read_msg(struct proto *p, struct ks_msg *msg, int scan) } void -krt_scan_construct(struct krt_config *c) +krt_scan_construct(struct krt_config *c UNUSED) { } void -krt_scan_preconfig(struct config *c) +krt_scan_preconfig(struct config *c UNUSED) { } void -krt_scan_postconfig(struct krt_config *c) +krt_scan_postconfig(struct krt_config *c UNUSED) { } void -krt_scan_start(struct krt_proto *x, int first) +krt_scan_start(struct krt_proto *x, int first UNUSED) { init_list(&x->scan.temp_ifs); } void -krt_scan_shutdown(struct krt_proto *x, int last) +krt_scan_shutdown(struct krt_proto *x UNUSED, int last UNUSED) { } @@ -639,12 +639,12 @@ krt_if_scan(struct kif_proto *p) void -krt_set_construct(struct krt_config *c) +krt_set_construct(struct krt_config *c UNUSED) { } void -krt_set_shutdown(struct krt_proto *x, int last) +krt_set_shutdown(struct krt_proto *x UNUSED, int last UNUSED) { } @@ -654,17 +654,17 @@ krt_if_io_init(void) } void -krt_if_construct(struct kif_config *c) +krt_if_construct(struct kif_config *c UNUSED) { } void -krt_if_start(struct kif_proto *p) +krt_if_start(struct kif_proto *p UNUSED) { } void -krt_if_shutdown(struct kif_proto *p) +krt_if_shutdown(struct kif_proto *p UNUSED) { } diff --git a/sysdep/bsd/krt-sock.h b/sysdep/bsd/krt-sock.h index 41ff9c5e..c5854351 100644 --- a/sysdep/bsd/krt-sock.h +++ b/sysdep/bsd/krt-sock.h @@ -41,7 +41,7 @@ struct krt_if_status { }; static int krt_set_hook(sock *sk, int size); -static inline int krt_set_params_same(struct krt_set_params *o, struct krt_set_params *n) { return 1; } +static inline int krt_set_params_same(struct krt_set_params *o UNUSED, struct krt_set_params *n UNUSED) { return 1; } void krt_read_msg(struct proto *p, struct ks_msg *msg, int scan); #endif diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index af87fc02..989930f3 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -495,8 +495,10 @@ krt_got_route(struct krt_proto *p, rte *e) { rte *old; net *net = e->net; - int src = e->u.krt.src; int verdict; +#ifdef KRT_ALLOW_LEARN + int src = e->u.krt.src; +#endif #ifdef CONFIG_AUTO_ROUTES if (e->attrs->dest == RTD_DEVICE) @@ -616,7 +618,11 @@ krt_prune(struct krt_proto *p) } void -krt_got_route_async(struct krt_proto *p, rte *e, int new) +krt_got_route_async(struct krt_proto *p, rte *e, int new +#ifndef KRT_ALLOW_LEARN +UNUSED +#endif +) { net *net = e->net; int src = e->u.krt.src;