diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-28 17:03:33 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-04-10 15:49:05 +0200 |
| commit | e9070f7ca279e2aede46540332842694c0021939 (patch) | |
| tree | d6162b5498c6bd15fdf7b2ca4f703a54b15f5739 | |
| parent | 888ddad6bde1dc6d7dbfc8daa7d015251b72e02c (diff) | |
| download | slirp-e9070f7ca279e2aede46540332842694c0021939.zip slirp-e9070f7ca279e2aede46540332842694c0021939.tar.gz slirp-e9070f7ca279e2aede46540332842694c0021939.tar.bz2 | |
icmp6: make ndp_send_ra static
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | src/ip6_icmp.c | 24 | ||||
| -rw-r--r-- | src/ip6_icmp.h | 1 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/ip6_icmp.c b/src/ip6_icmp.c index 738b40f..e259ff5 100644 --- a/src/ip6_icmp.c +++ b/src/ip6_icmp.c @@ -10,16 +10,7 @@ #define NDP_Interval \ g_rand_int_range(slirp->grand, NDP_MinRtrAdvInterval, NDP_MaxRtrAdvInterval) -static void ra_timer_handler(void *opaque) -{ - Slirp *slirp = opaque; - - slirp->cb->timer_mod(slirp->ra_timer, - slirp->cb->clock_get_ns(slirp->opaque) / SCALE_MS + - NDP_Interval, - slirp->opaque); - ndp_send_ra(slirp); -} +static void ra_timer_handler(void *opaque); void icmp6_init(Slirp *slirp) { @@ -140,7 +131,7 @@ void icmp6_send_error(struct mbuf *m, uint8_t type, uint8_t code) /* * Send NDP Router Advertisement */ -void ndp_send_ra(Slirp *slirp) +static void ndp_send_ra(Slirp *slirp) { DEBUG_CALL("ndp_send_ra"); @@ -219,6 +210,17 @@ void ndp_send_ra(Slirp *slirp) ip6_output(NULL, t, 0); } +static void ra_timer_handler(void *opaque) +{ + Slirp *slirp = opaque; + + slirp->cb->timer_mod(slirp->ra_timer, + slirp->cb->clock_get_ns(slirp->opaque) / SCALE_MS + + NDP_Interval, + slirp->opaque); + ndp_send_ra(slirp); +} + /* * Send NDP Neighbor Solitication */ diff --git a/src/ip6_icmp.h b/src/ip6_icmp.h index 9070999..2d3a795 100644 --- a/src/ip6_icmp.h +++ b/src/ip6_icmp.h @@ -214,7 +214,6 @@ void icmp6_cleanup(Slirp *slirp); void icmp6_input(struct mbuf *); void icmp6_forward_error(struct mbuf *m, uint8_t type, uint8_t code, struct in6_addr *src); void icmp6_send_error(struct mbuf *m, uint8_t type, uint8_t code); -void ndp_send_ra(Slirp *slirp); void ndp_send_ns(Slirp *slirp, struct in6_addr addr); #endif |