From 8948d00545edf5258b895ad6deca7744dde291ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Mon, 4 Nov 2019 15:00:03 +0000 Subject: [PATCH] Reorder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrien Gallouët --- mud.c | 72 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/mud.c b/mud.c index dc3ef4e..b4c6dfd 100644 --- a/mud.c +++ b/mud.c @@ -795,42 +795,6 @@ mud_set_keyx_timeout(struct mud *mud, unsigned long msec) return mud_set_msec(&mud->keyx_timeout, msec); } -int -mud_set_state(struct mud *mud, struct sockaddr *addr, - enum mud_state state, - unsigned long rate_tx, - unsigned long rate_rx) -{ - if (!mud->peer.set || state > MUD_UP) { - errno = EINVAL; - return -1; - } - - struct sockaddr_storage local_addr; - - if (mud_ss_from_sa(&local_addr, addr)) - return -1; - - struct mud_path *path = mud_get_path(mud, - &local_addr, &mud->peer.addr, state > MUD_DOWN); - - if (!path) - return -1; - - if (rate_tx) - path->tx.rate = rate_tx; - - if (rate_rx) - path->rx.rate = rate_rx; - - if (state && path->state != state) { - path->state = state; - mud_reset_path(path); // XXX - } - - return 0; -} - size_t mud_get_mtu(struct mud *mud) { @@ -1556,6 +1520,42 @@ mud_update(struct mud *mud) return ret; } +int +mud_set_state(struct mud *mud, struct sockaddr *addr, + enum mud_state state, + unsigned long rate_tx, + unsigned long rate_rx) +{ + if (!mud->peer.set || state > MUD_UP) { + errno = EINVAL; + return -1; + } + + struct sockaddr_storage local_addr; + + if (mud_ss_from_sa(&local_addr, addr)) + return -1; + + struct mud_path *path = mud_get_path(mud, + &local_addr, &mud->peer.addr, state > MUD_DOWN); + + if (!path) + return -1; + + if (rate_tx) + path->tx.rate = rate_tx; + + if (rate_rx) + path->rx.rate = rate_rx; + + if (state && path->state != state) { + path->state = state; + mud_reset_path(path); // XXX + } + + return 0; +} + long mud_send_wait(struct mud *mud) {