commits September 2013

commits@lists.open-mesh.org

1 participants
91 discussions

[alfred] master: alfred: Allow to switch daemon between slave and master (06ce1cc)
by postmaster＠open-mesh.org 09 Sep '13

09 Sep '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 06ce1ccfd08c200f65cddac45e83b3d357c0b4ac Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Mon Sep 9 17:46:07 2013 +0200 alfred: Allow to switch daemon between slave and master The running daemon may need to be switched between from master to slave mode or from slave to master mode to increase the efficiency of the data distribution network. This must be possible during runtime to avoid the data loss during the switch time. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> [simon(a)open-mesh.com: added newlines for help text] Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 06ce1ccfd08c200f65cddac45e83b3d357c0b4ac alfred.h | 2 ++ client.c | 38 ++++++++++++++++++++++++++++++++++++++ main.c | 19 ++++++++++++++++++- packet.h | 24 ++++++++++++++++++++++++ unix_sock.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 115 insertions(+), 1 deletion(-) diff --git a/alfred.h b/alfred.h index e44919c..e931b1b 100644 --- a/alfred.h +++ b/alfred.h @@ -84,6 +84,7 @@ enum clientmode { CLIENT_NONE, CLIENT_REQUEST_DATA, CLIENT_SET_DATA, + CLIENT_MODESWITCH, }; struct globals { @@ -119,6 +120,7 @@ int set_best_server(struct globals *globals); /* client.c */ int alfred_client_request_data(struct globals *globals); int alfred_client_set_data(struct globals *globals); +int alfred_client_modeswitch(struct globals *globals); /* recv.c */ int recv_alfred_packet(struct globals *globals); struct transaction_head * diff --git a/client.c b/client.c index 2187ff2..4bc7b5c 100644 --- a/client.c +++ b/client.c @@ -179,3 +179,41 @@ int alfred_client_set_data(struct globals *globals) unix_sock_close(globals); return 0; } + +int alfred_client_modeswitch(struct globals *globals) +{ + unsigned char buf[MAX_PAYLOAD]; + struct alfred_modeswitch_v0 *modeswitch; + int ret, len; + + if (unix_sock_open_client(globals, ALFRED_SOCK_PATH)) + return -1; + + modeswitch = (struct alfred_modeswitch_v0 *)buf; + len = sizeof(*modeswitch); + + modeswitch->header.type = ALFRED_MODESWITCH; + modeswitch->header.version = ALFRED_VERSION; + modeswitch->header.length = htons(len - sizeof(modeswitch->header)); + + switch (globals->opmode) { + case OPMODE_SLAVE: + modeswitch->mode = ALFRED_MODESWITCH_SLAVE; + break; + case OPMODE_MASTER: + modeswitch->mode = ALFRED_MODESWITCH_MASTER; + break; + default: + fprintf(stderr, "%s: unknown opmode %u in modeswitch\n", + __func__, globals->opmode); + return -1; + } + + ret = write(globals->unix_sock, buf, len); + if (ret != len) + fprintf(stderr, "%s: only wrote %d of %d bytes: %s\n", + __func__, ret, len, strerror(errno)); + + unix_sock_close(globals); + return 0; +} diff --git a/main.c b/main.c index 4f39948..8664320 100644 --- a/main.c +++ b/main.c @@ -37,6 +37,8 @@ static void alfred_usage(void) printf(" -r, --request [data type] collect data from the network and prints\n"); printf(" it on the network\n"); printf(" -V, --req-version specify the data version set for -s\n"); + printf(" -M, --modeswitch master switch daemon to mode master\n"); + printf(" slave switch daemon to mode slave\n"); printf("\n"); printf("server mode options:\n"); printf(" -i, --interface specify the interface to listen on\n"); @@ -62,6 +64,7 @@ static struct globals *alfred_init(int argc, char *argv[]) {"master", no_argument, NULL, 'm'}, {"help", no_argument, NULL, 'h'}, {"req-version", required_argument, NULL, 'V'}, + {"modeswitch", required_argument, NULL, 'M'}, {"version", no_argument, NULL, 'v'}, {NULL, 0, NULL, 0}, }; @@ -81,7 +84,7 @@ static struct globals *alfred_init(int argc, char *argv[]) time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -120,6 +123,17 @@ static struct globals *alfred_init(int argc, char *argv[]) } globals->clientmode_version = atoi(optarg); break; + case 'M': + if (strcmp(optarg, "master") == 0) { + globals->opmode = OPMODE_MASTER; + } else if (strcmp(optarg, "slave") == 0) { + globals->opmode = OPMODE_SLAVE; + } else { + fprintf(stderr, "bad modeswitch argument\n"); + return NULL; + } + globals->clientmode = CLIENT_MODESWITCH; + break; case 'v': printf("%s %s\n", argv[0], SOURCE_VERSION); printf("A.L.F.R.E.D. - Almighty Lightweight Remote Fact Exchange Daemon\n"); @@ -155,6 +169,9 @@ int main(int argc, char *argv[]) case CLIENT_SET_DATA: return alfred_client_set_data(globals); break; + case CLIENT_MODESWITCH: + return alfred_client_modeswitch(globals); + break; } return 0; diff --git a/packet.h b/packet.h index 57fa471..8250c9c 100644 --- a/packet.h +++ b/packet.h @@ -66,6 +66,7 @@ struct alfred_transaction_mgmt { * @ALFRED_REQUEST: Packet is an alfred_request_v* * @ALFRED_STATUS_TXEND: Transaction was finished by sender * @ALFRED_STATUS_ERROR: Error was detected during the transaction + * @ALFRED_MODESWITCH: Switch between different operation modes */ enum alfred_packet_type { ALFRED_PUSH_DATA = 0, @@ -73,6 +74,7 @@ enum alfred_packet_type { ALFRED_REQUEST = 2, ALFRED_STATUS_TXEND = 3, ALFRED_STATUS_ERROR = 4, + ALFRED_MODESWITCH = 5, }; /* packets */ @@ -119,6 +121,28 @@ struct alfred_request_v0 { } __packed; /** + * enum alfred_modeswitch_type - Mode of the daemon + * @ALFRED_MODESWITCH_SLAVE: see OPMODE_SLAVE + * @ALFRED_MODESWITCH_MASTER: see OPMODE_MASTER + */ +enum alfred_modeswitch_type { + ALFRED_MODESWITCH_SLAVE = 0, + ALFRED_MODESWITCH_MASTER = 1, +}; + +/** + * struct alfred_modeswitch_v0 - Request for a specific type + * @header: TLV header describing the complete packet + * @mode: data type which is requested + * + * Sent to the daemon by client + */ +struct alfred_modeswitch_v0 { + struct alfred_tlv header; + uint8_t mode; +} __packed; + +/** * struct alfred_status_v0 - Status info of a transaction * @header: TLV header describing the complete packet * @tx: Transaction identificator and sequence number of packet diff --git a/unix_sock.c b/unix_sock.c index e6b22e8..3738d6d 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -272,6 +272,34 @@ int unix_sock_req_data_finish(struct globals *globals, return ret; } +static int unix_sock_modesw(struct globals *globals, + struct alfred_modeswitch_v0 *modeswitch, + int client_sock) +{ + int len, ret = -1; + + len = ntohs(modeswitch->header.length); + + if (len < (int)(sizeof(*modeswitch) - sizeof(modeswitch->header))) + goto err; + + switch (modeswitch->mode) { + case ALFRED_MODESWITCH_SLAVE: + globals->opmode = OPMODE_SLAVE; + break; + case ALFRED_MODESWITCH_MASTER: + globals->opmode = OPMODE_MASTER; + break; + default: + goto err; + } + + ret = 0; +err: + close(client_sock); + return ret; +} + int unix_sock_read(struct globals *globals) { int client_sock; @@ -321,6 +349,11 @@ int unix_sock_read(struct globals *globals) (struct alfred_request_v0 *)packet, client_sock); break; + case ALFRED_MODESWITCH: + ret = unix_sock_modesw(globals, + (struct alfred_modeswitch_v0 *)packet, + client_sock); + break; default: /* unknown packet type */ ret = -1;

1 0

[alfred] master: alfred: Remove dead assignment in unix_sock_read (a66dc45)
by postmaster＠open-mesh.org 09 Sep '13

09 Sep '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit a66dc45da22cf2295e6803ae454b36b9d2ab7219 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Mon Sep 9 17:46:05 2013 +0200 alfred: Remove dead assignment in unix_sock_read Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- a66dc45da22cf2295e6803ae454b36b9d2ab7219 unix_sock.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/unix_sock.c b/unix_sock.c index 6b80f38..e6b22e8 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -310,8 +310,6 @@ int unix_sock_read(struct globals *globals) if (packet->version != ALFRED_VERSION) goto err; - ret = 0; - switch (packet->type) { case ALFRED_PUSH_DATA: ret = unix_sock_add_data(globals,

1 0

[alfred] master: alfred: Fix warning about assigning const to non-const (669fb47)
by postmaster＠open-mesh.org 09 Sep '13

09 Sep '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 669fb47a42720174444bebfa862f90dd7ade43cf Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Mon Sep 9 17:46:03 2013 +0200 alfred: Fix warning about assigning const to non-const Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 669fb47a42720174444bebfa862f90dd7ade43cf alfred.h | 8 ++++---- batadv_query.c | 6 +++--- batadv_query.h | 6 +++--- debugfs.c | 3 ++- debugfs.h | 2 +- unix_sock.c | 4 ++-- vis/vis.h | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/alfred.h b/alfred.h index a244c64..e44919c 100644 --- a/alfred.h +++ b/alfred.h @@ -91,8 +91,8 @@ struct globals { struct in6_addr address; uint32_t scope_id; struct server *best_server; /* NULL if we are a server ourselves */ - char *interface; - char *mesh_iface; + const char *interface; + const char *mesh_iface; enum opmode opmode; enum clientmode clientmode; int clientmode_arg; @@ -139,8 +139,8 @@ int send_alfred_packet(struct globals *globals, const struct in6_addr *dest, void *buf, int length); /* unix_sock.c */ int unix_sock_read(struct globals *globals); -int unix_sock_open_daemon(struct globals *globals, char *path); -int unix_sock_open_client(struct globals *globals, char *path); +int unix_sock_open_daemon(struct globals *globals, const char *path); +int unix_sock_open_client(struct globals *globals, const char *path); int unix_sock_close(struct globals *globals); int unix_sock_req_data_finish(struct globals *globals, struct transaction_head *head); diff --git a/batadv_query.c b/batadv_query.c index 83083a1..f1e3f24 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -88,7 +88,7 @@ int ipv6_to_mac(const struct in6_addr *addr, struct ether_addr *mac) return 0; } -int batadv_interface_check(char *mesh_iface) +int batadv_interface_check(const char *mesh_iface) { char *debugfs_mnt; char full_path[MAX_PATH+1]; @@ -125,7 +125,7 @@ int batadv_interface_check(char *mesh_iface) return 0; } -struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) +struct ether_addr *translate_mac(const char *mesh_iface, struct ether_addr *mac) { enum { tg_start, @@ -207,7 +207,7 @@ out: return mac_result; } -uint8_t get_tq(char *mesh_iface, struct ether_addr *mac) +uint8_t get_tq(const char *mesh_iface, struct ether_addr *mac) { enum { orig_mac, diff --git a/batadv_query.h b/batadv_query.h index 7dca319..5ab6f3e 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -24,9 +24,9 @@ #include <stdint.h> #include <netinet/in.h> -struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); -uint8_t get_tq(char *mesh_iface, struct ether_addr *mac); -int batadv_interface_check(char *mesh_iface); +struct ether_addr *translate_mac(const char *mesh_iface, struct ether_addr *mac); +uint8_t get_tq(const char *mesh_iface, struct ether_addr *mac); +int batadv_interface_check(const char *mesh_iface); int mac_to_ipv6(const struct ether_addr *mac, struct in6_addr *addr); int ipv6_to_mac(const struct in6_addr *addr, struct ether_addr *mac); int is_ipv6_eui64(const struct in6_addr *addr); diff --git a/debugfs.c b/debugfs.c index e62978b..1e9418d 100644 --- a/debugfs.c +++ b/debugfs.c @@ -43,7 +43,8 @@ static const char *debugfs_known_mountpoints[] = { }; /* construct a full path to a debugfs element */ -int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) +int debugfs_make_path(const char *fmt, const char *mesh_iface, char *buffer, + int size) { int len; diff --git a/debugfs.h b/debugfs.h index 6307a9b..b4dc6bb 100644 --- a/debugfs.h +++ b/debugfs.h @@ -32,7 +32,7 @@ extern int debugfs_valid_entry(const char *path); extern char *debugfs_mount(const char *mountpoint); -extern int debugfs_make_path(const char *fmt, char *mesh_iface, +extern int debugfs_make_path(const char *fmt, const char *mesh_iface, char *buffer, int size); #endif /* __DEBUGFS_H__ */ diff --git a/unix_sock.c b/unix_sock.c index 8bff2e1..6b80f38 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -35,7 +35,7 @@ #include "hash.h" #include "packet.h" -int unix_sock_open_daemon(struct globals *globals, char *path) +int unix_sock_open_daemon(struct globals *globals, const char *path) { struct sockaddr_un addr; @@ -68,7 +68,7 @@ int unix_sock_open_daemon(struct globals *globals, char *path) return 0; } -int unix_sock_open_client(struct globals *globals, char *path) +int unix_sock_open_client(struct globals *globals, const char *path) { struct sockaddr_un addr; diff --git a/vis/vis.h b/vis/vis.h index d4a49d0..6ba70c6 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -89,7 +89,7 @@ struct vis_list_entry { + (vis_data)->entries_n * sizeof(struct vis_entry)) struct globals { - char *interface; + const char *interface; enum opmode opmode; enum vis_format vis_format; uint8_t buf[65536];

1 0

[alfred] master: alfred: Fix crash when vis opened empty file (1606d72)
by postmaster＠open-mesh.org 09 Sep '13

09 Sep '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 1606d72d88515c01941ce919679fcc49c44cc63f Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Mon Sep 9 17:46:06 2013 +0200 alfred: Fix crash when vis opened empty file Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 1606d72d88515c01941ce919679fcc49c44cc63f vis/vis.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vis/vis.c b/vis/vis.c index 5e7a109..36ea7fe 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -59,7 +59,8 @@ static char *read_file(char *fname) } fclose(fp); - buf[size] = 0; + if (buf) + buf[size] = 0; return buf; }

1 0

[alfred] master: alfred: Mark all local functions as static (65aee8d)
by postmaster＠open-mesh.org 09 Sep '13

09 Sep '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 65aee8d55aacbb5d7b43147a091229bda632976d Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Mon Sep 9 17:46:02 2013 +0200 alfred: Mark all local functions as static Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 65aee8d55aacbb5d7b43147a091229bda632976d vis/vis.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/vis/vis.c b/vis/vis.c index 5247b31..5e7a109 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -36,7 +36,7 @@ #include <unistd.h> #include "debugfs.h" -char *read_file(char *fname) +static char *read_file(char *fname) { FILE *fp; char *buf = NULL; @@ -64,7 +64,7 @@ char *read_file(char *fname) return buf; } -char *mac_to_str(uint8_t *mac) +static char *mac_to_str(uint8_t *mac) { static char macstr[20]; snprintf(macstr, sizeof(macstr), "%02x:%02x:%02x:%02x:%02x:%02x", @@ -72,7 +72,7 @@ char *mac_to_str(uint8_t *mac) return macstr; } -uint8_t *str_to_mac(char *str) +static uint8_t *str_to_mac(char *str) { static uint8_t mac[ETH_ALEN]; int ret; @@ -91,7 +91,7 @@ uint8_t *str_to_mac(char *str) return mac; } -int get_if_mac(char *ifname, uint8_t *mac) +static int get_if_mac(char *ifname, uint8_t *mac) { struct ifreq ifr; int sock; @@ -112,7 +112,7 @@ int get_if_mac(char *ifname, uint8_t *mac) return 0; } -int get_if_index(struct globals *globals, char *ifname) +static int get_if_index(struct globals *globals, char *ifname) { struct iface_list_entry *i_entry; int i; @@ -143,7 +143,7 @@ int get_if_index(struct globals *globals, char *ifname) return i; } -int alfred_open_sock(struct globals *globals) +static int alfred_open_sock(struct globals *globals) { struct sockaddr_un addr; @@ -168,7 +168,7 @@ int alfred_open_sock(struct globals *globals) return 0; } -int parse_transtable_local(struct globals *globals) +static int parse_transtable_local(struct globals *globals) { char *fbuf; char *lptr, *tptr; @@ -218,7 +218,7 @@ int parse_transtable_local(struct globals *globals) return 0; } -void clear_lists(struct globals *globals) +static void clear_lists(struct globals *globals) { struct vis_list_entry *v_entry, *v_entry_safe; struct iface_list_entry *i_entry, *i_entry_safe; @@ -300,7 +300,7 @@ err: } -int parse_orig_list(struct globals *globals) +static int parse_orig_list(struct globals *globals) { char *fbuf; char *lptr, *tptr; @@ -368,7 +368,7 @@ int parse_orig_list(struct globals *globals) return 0; } -int vis_publish_data(struct globals *globals) +static int vis_publish_data(struct globals *globals) { int len, ret; @@ -396,7 +396,7 @@ int vis_publish_data(struct globals *globals) return 0; } -int compile_vis_data(struct globals *globals) +static int compile_vis_data(struct globals *globals) { struct iface_list_entry *i_entry; struct vis_list_entry *v_entry; @@ -424,7 +424,7 @@ int compile_vis_data(struct globals *globals) return 0; } -int vis_update_data(struct globals *globals) +static int vis_update_data(struct globals *globals) { clear_lists(globals); register_interfaces(globals); @@ -437,7 +437,7 @@ int vis_update_data(struct globals *globals) return 0; } -int vis_request_data(struct globals *globals) +static int vis_request_data(struct globals *globals) { int ret; @@ -463,7 +463,7 @@ int vis_request_data(struct globals *globals) } -struct vis_v1 *vis_receive_answer_packet(int sock, uint16_t *len) +static struct vis_v1 *vis_receive_answer_packet(int sock, uint16_t *len) { static uint8_t buf[65536]; struct alfred_tlv *tlv; @@ -510,7 +510,7 @@ struct vis_v1 *vis_receive_answer_packet(int sock, uint16_t *len) return (struct vis_v1 *) data->data; } -int vis_read_answer(struct globals *globals) +static int vis_read_answer(struct globals *globals) { struct vis_v1 *vis_data; uint16_t len; @@ -593,7 +593,7 @@ int vis_read_answer(struct globals *globals) return 0; } -int vis_get_data(struct globals *globals) +static int vis_get_data(struct globals *globals) { globals->unix_sock = vis_request_data(globals); if (globals->unix_sock < 0) @@ -676,7 +676,7 @@ static struct globals *vis_init(int argc, char *argv[]) -int vis_server(struct globals *globals) +static int vis_server(struct globals *globals) { char *debugfs_mnt;

1 0

[alfred] master: alfred: Stop client when data header could not be read (6a2276c)
by postmaster＠open-mesh.org 09 Sep '13

09 Sep '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 6a2276c084e78be16abc55b8c03420c9dac98ffa Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Mon Sep 9 17:46:04 2013 +0200 alfred: Stop client when data header could not be read Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 6a2276c084e78be16abc55b8c03420c9dac98ffa client.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client.c b/client.c index 3c1916c..2187ff2 100644 --- a/client.c +++ b/client.c @@ -81,6 +81,9 @@ int alfred_client_request_data(struct globals *globals) ret = read(globals->unix_sock, buf + sizeof(*push), sizeof(*data)); + if (ret < (ssize_t)sizeof(*data)) + break; + data = push->data; data_len = ntohs(data->header.length);

1 0

[batman-adv] master: batman-adv: adapt the TT component to use the new API functions (a468009)
by postmaster＠open-mesh.org 04 Sep '13

04 Sep '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a4680099ae5947f4a5360910ccb7da958d684b9c Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue Sep 3 11:10:24 2013 +0200 batman-adv: adapt the TT component to use the new API functions Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a4680099ae5947f4a5360910ccb7da958d684b9c translation-table.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/translation-table.c b/translation-table.c index f997709..1198aea 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1339,18 +1339,20 @@ out: } /* batadv_transtable_best_orig - Get best originator list entry from tt entry + * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be analyzed * * This functon assumes the caller holds rcu_read_lock(). * Returns best originator list entry or NULL on errors. */ static struct batadv_tt_orig_list_entry * -batadv_transtable_best_orig(struct batadv_tt_global_entry *tt_global_entry) +batadv_transtable_best_orig(struct batadv_priv *bat_priv, + struct batadv_tt_global_entry *tt_global_entry) { - struct batadv_neigh_node *router = NULL; + struct batadv_neigh_node *router, *best_router = NULL; + struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry, *best_entry = NULL; - int best_tq = 0; head = &tt_global_entry->orig_list; hlist_for_each_entry_rcu(orig_entry, head, list) { @@ -1358,26 +1360,37 @@ batadv_transtable_best_orig(struct batadv_tt_global_entry *tt_global_entry) if (!router) continue; - if (router->bat_iv.tq_avg > best_tq) { - best_entry = orig_entry; - best_tq = router->bat_iv.tq_avg; + if (best_router && + bao->bat_neigh_cmp(router, best_router) <= 0) { + batadv_neigh_node_free_ref(router); + continue; } - batadv_neigh_node_free_ref(router); + /* release the refcount for the "old" best */ + if (best_router) + batadv_neigh_node_free_ref(best_router); + + best_entry = orig_entry; + best_router = router; } + if (best_router) + batadv_neigh_node_free_ref(best_router); + return best_entry; } /* batadv_tt_global_print_entry - print all orig nodes who announce the address * for this global entry + * @bat_priv: the bat priv with all the soft interface information * @tt_global_entry: global translation table entry to be printed * @seq: debugfs table seq_file struct * * This functon assumes the caller holds rcu_read_lock(). */ static void -batadv_tt_global_print_entry(struct batadv_tt_global_entry *tt_global_entry, +batadv_tt_global_print_entry(struct batadv_priv *bat_priv, + struct batadv_tt_global_entry *tt_global_entry, struct seq_file *seq) { struct batadv_tt_orig_list_entry *orig_entry, *best_entry; @@ -1390,7 +1403,7 @@ batadv_tt_global_print_entry(struct batadv_tt_global_entry *tt_global_entry, tt_common_entry = &tt_global_entry->common; flags = tt_common_entry->flags; - best_entry = batadv_transtable_best_orig(tt_global_entry); + best_entry = batadv_transtable_best_orig(bat_priv, tt_global_entry); if (best_entry) { vlan = batadv_orig_node_vlan_get(best_entry->orig_node, tt_common_entry->vid); @@ -1479,7 +1492,7 @@ int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset) tt_global = container_of(tt_common_entry, struct batadv_tt_global_entry, common); - batadv_tt_global_print_entry(tt_global, seq); + batadv_tt_global_print_entry(bat_priv, tt_global, seq); } rcu_read_unlock(); } @@ -1867,7 +1880,7 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, goto out; rcu_read_lock(); - best_entry = batadv_transtable_best_orig(tt_global_entry); + best_entry = batadv_transtable_best_orig(bat_priv, tt_global_entry); /* found anything? */ if (best_entry) orig_node = best_entry->orig_node;

1 0

[batman-adv] master: batman-adv: provide orig_node routing API (fdafa7d)
by postmaster＠open-mesh.org 04 Sep '13

04 Sep '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit fdafa7d29ace95f1759ce19dcff2a14e471d26da Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue Sep 3 11:10:23 2013 +0200 batman-adv: provide orig_node routing API Some operations executed on an orig_node depends on the current routing algorithm being used. To easily make this mechanism routing algorithm agnostic add a orig_node specific API that each algorithm can populate with its own routines. Such routines are then invoked by the code when needed, without knowing which routing algorithm is currently in use With this patch 3 API functions are added: - orig_free (to free routing depending internal structs) - orig_add_if (to change the inner state of an orig_node when a new hard interface is added) - orig_del_if (to change the inner state of an orig_node when an hard interface is removed) Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- fdafa7d29ace95f1759ce19dcff2a14e471d26da bat_iv_ogm.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ originator.c | 102 +++++++---------------------------------------- types.h | 11 +++++ 3 files changed, 151 insertions(+), 88 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 7cdc394..a2b480a 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -88,6 +88,129 @@ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[]) } /** + * batadv_iv_ogm_orig_free - free the private resources allocated for this + * orig_node + * @orig_node: the orig_node for which the resources have to be free'd + */ +static void batadv_iv_ogm_orig_free(struct batadv_orig_node *orig_node) +{ + kfree(orig_node->bat_iv.bcast_own); + kfree(orig_node->bat_iv.bcast_own_sum); +} + +/** + * batadv_iv_ogm_orig_add_if - change the private structures of the orig_node to + * include the new hard-interface + * @orig_node: the orig_node that has to be changed + * @max_if_num: the current amount of interfaces + * + * Returns 0 on success, a negative error code otherwise. + */ +static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, + int max_if_num) +{ + void *data_ptr; + size_t data_size, old_size; + int ret = -ENOMEM; + + spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS; + old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS; + data_ptr = kmalloc(data_size, GFP_ATOMIC); + if (!data_ptr) + goto unlock; + + memcpy(data_ptr, orig_node->bat_iv.bcast_own, old_size); + kfree(orig_node->bat_iv.bcast_own); + orig_node->bat_iv.bcast_own = data_ptr; + + data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); + if (!data_ptr) { + kfree(orig_node->bat_iv.bcast_own); + goto unlock; + } + + memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, + (max_if_num - 1) * sizeof(uint8_t)); + kfree(orig_node->bat_iv.bcast_own_sum); + orig_node->bat_iv.bcast_own_sum = data_ptr; + + ret = 0; + +unlock: + spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + return ret; +} + +/** + * batadv_iv_ogm_orig_del_if - change the private structures of the orig_node to + * exclude the removed interface + * @orig_node: the orig_node that has to be changed + * @max_if_num: the current amount of interfaces + * @del_if_num: the index of the interface being removed + * + * Returns 0 on success, a negative error code otherwise. + */ +static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, + int max_if_num, int del_if_num) +{ + int chunk_size, ret = -ENOMEM, if_offset; + void *data_ptr = NULL; + + spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + /* last interface was removed */ + if (max_if_num == 0) + goto free_bcast_own; + + chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS; + data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); + if (!data_ptr) + goto unlock; + + /* copy first part */ + memcpy(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size); + + /* copy second part */ + memcpy((char *)data_ptr + del_if_num * chunk_size, + orig_node->bat_iv.bcast_own + ((del_if_num + 1) * chunk_size), + (max_if_num - del_if_num) * chunk_size); + +free_bcast_own: + kfree(orig_node->bat_iv.bcast_own); + orig_node->bat_iv.bcast_own = data_ptr; + + if (max_if_num == 0) + goto free_own_sum; + + data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); + if (!data_ptr) { + kfree(orig_node->bat_iv.bcast_own); + goto unlock; + } + + memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, + del_if_num * sizeof(uint8_t)); + + if_offset = (del_if_num + 1) * sizeof(uint8_t); + memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), + orig_node->bat_iv.bcast_own_sum + if_offset, + (max_if_num - del_if_num) * sizeof(uint8_t)); + +free_own_sum: + kfree(orig_node->bat_iv.bcast_own_sum); + orig_node->bat_iv.bcast_own_sum = data_ptr; + + ret = 0; +unlock: + spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); + + return ret; +} + +/** * batadv_iv_ogm_orig_get - retrieve or create (if does not exist) an originator * @bat_priv: the bat priv with all the soft interface information * @addr: mac address of the originator @@ -1522,6 +1645,9 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .bat_neigh_cmp = batadv_iv_ogm_neigh_cmp, .bat_neigh_is_equiv_or_better = batadv_iv_ogm_neigh_is_eob, .bat_orig_print = batadv_iv_ogm_orig_print, + .bat_orig_free = batadv_iv_ogm_orig_free, + .bat_orig_add_if = batadv_iv_ogm_orig_add_if, + .bat_orig_del_if = batadv_iv_ogm_orig_del_if, }; int __init batadv_iv_init(void) diff --git a/originator.c b/originator.c index 9cee053..8ab1434 100644 --- a/originator.c +++ b/originator.c @@ -241,9 +241,10 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu) batadv_tt_global_del_orig(orig_node->bat_priv, orig_node, -1, "originator timed out"); + if (orig_node->bat_priv->bat_algo_ops->bat_orig_free) + orig_node->bat_priv->bat_algo_ops->bat_orig_free(orig_node); + kfree(orig_node->tt_buff); - kfree(orig_node->bat_iv.bcast_own); - kfree(orig_node->bat_iv.bcast_own_sum); kfree(orig_node); } @@ -538,38 +539,11 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) return 0; } -static int batadv_orig_node_add_if(struct batadv_orig_node *orig_node, - int max_if_num) -{ - void *data_ptr; - size_t data_size, old_size; - - data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS; - old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS; - data_ptr = kmalloc(data_size, GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - memcpy(data_ptr, orig_node->bat_iv.bcast_own, old_size); - kfree(orig_node->bat_iv.bcast_own); - orig_node->bat_iv.bcast_own = data_ptr; - - data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, - (max_if_num - 1) * sizeof(uint8_t)); - kfree(orig_node->bat_iv.bcast_own_sum); - orig_node->bat_iv.bcast_own_sum = data_ptr; - - return 0; -} - int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, int max_if_num) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; struct batadv_hashtable *hash = bat_priv->orig_hash; struct hlist_head *head; struct batadv_orig_node *orig_node; @@ -584,10 +558,10 @@ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); - ret = batadv_orig_node_add_if(orig_node, max_if_num); - spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); - + ret = 0; + if (bao->bat_orig_add_if) + ret = bao->bat_orig_add_if(orig_node, + max_if_num); if (ret == -ENOMEM) goto err; } @@ -601,55 +575,6 @@ err: return -ENOMEM; } -static int batadv_orig_node_del_if(struct batadv_orig_node *orig_node, - int max_if_num, int del_if_num) -{ - int chunk_size, if_offset; - void *data_ptr = NULL; - - /* last interface was removed */ - if (max_if_num == 0) - goto free_bcast_own; - - chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS; - data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - /* copy first part */ - memcpy(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size); - - /* copy second part */ - memcpy((char *)data_ptr + del_if_num * chunk_size, - orig_node->bat_iv.bcast_own + ((del_if_num + 1) * chunk_size), - (max_if_num - del_if_num) * chunk_size); - -free_bcast_own: - kfree(orig_node->bat_iv.bcast_own); - orig_node->bat_iv.bcast_own = data_ptr; - - if (max_if_num == 0) - goto free_own_sum; - - data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC); - if (!data_ptr) - return -ENOMEM; - - memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum, - del_if_num * sizeof(uint8_t)); - - if_offset = (del_if_num + 1) * sizeof(uint8_t); - memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t), - orig_node->bat_iv.bcast_own_sum + if_offset, - (max_if_num - del_if_num) * sizeof(uint8_t)); - -free_own_sum: - kfree(orig_node->bat_iv.bcast_own_sum); - orig_node->bat_iv.bcast_own_sum = data_ptr; - - return 0; -} - int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, int max_if_num) { @@ -658,6 +583,7 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, struct hlist_head *head; struct batadv_hard_iface *hard_iface_tmp; struct batadv_orig_node *orig_node; + struct batadv_algo_ops *bao = bat_priv->bat_algo_ops; uint32_t i; int ret; @@ -669,11 +595,11 @@ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, rcu_read_lock(); hlist_for_each_entry_rcu(orig_node, head, hash_entry) { - spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); - ret = batadv_orig_node_del_if(orig_node, max_if_num, - hard_iface->if_num); - spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); - + ret = 0; + if (bao->bat_orig_del_if) + ret = bao->bat_orig_del_if(orig_node, + max_if_num, + hard_iface->if_num); if (ret == -ENOMEM) goto err; } diff --git a/types.h b/types.h index c0761a4..f323822 100644 --- a/types.h +++ b/types.h @@ -999,6 +999,12 @@ struct batadv_forw_packet { * @bat_neigh_is_equiv_or_better: check if neigh1 is equally good or * better than neigh2 from the metric prospective * @bat_orig_print: print the originator table (optional) + * @bat_orig_free: free the resources allocated by the routing algorithm for an + * orig_node object + * @bat_orig_add_if: ask the routing algorithm to apply the needed changes to + * the orig_node due to a new hard-interface being added into the mesh + * @bat_orig_del_if: ask the routing algorithm to apply the needed changes to + * the orig_node due to an hard-interface being removed from the mesh */ struct batadv_algo_ops { struct hlist_node list; @@ -1015,6 +1021,11 @@ struct batadv_algo_ops { struct batadv_neigh_node *neigh2); /* orig_node handling API */ void (*bat_orig_print)(struct batadv_priv *priv, struct seq_file *seq); + void (*bat_orig_free)(struct batadv_orig_node *orig_node); + int (*bat_orig_add_if)(struct batadv_orig_node *orig_node, + int max_if_num); + int (*bat_orig_del_if)(struct batadv_orig_node *orig_node, + int max_if_num, int del_if_num); }; /**

1 0

[batman-adv] master: batman-adv: limit local translation table max size (f7f2fe4)
by postmaster＠open-mesh.org 03 Sep '13

03 Sep '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f7f2fe494388fca828094a4ebdab918a7b2d64f8 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon May 27 15:33:25 2013 +0800 batman-adv: limit local translation table max size The local translation table size is limited by what can be transferred from one node to another via a full table request. The number of entries fitting into a full table request depend on whether the fragmentation is enabled or not. Therefore this patch introduces a max table size check and refuses to add more local clients when that size is reached. Moreover, if the max full table packet size changes (MTU change or fragmentation is disabled) the local table is downsized instantaneously. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- f7f2fe494388fca828094a4ebdab918a7b2d64f8 hard-interface.c | 41 ++++++++------ soft-interface.c | 12 +++-- translation-table.c | 150 +++++++++++++++++++++++++++++++++++++++++++++------ translation-table.h | 3 +- types.h | 3 ++ 5 files changed, 173 insertions(+), 36 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index c5f871f..c60d3ed 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -266,16 +266,9 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev) int batadv_hardif_min_mtu(struct net_device *soft_iface) { - const struct batadv_priv *bat_priv = netdev_priv(soft_iface); + struct batadv_priv *bat_priv = netdev_priv(soft_iface); const struct batadv_hard_iface *hard_iface; - /* allow big frames if all devices are capable to do so - * (have MTU > 1500 + batadv_max_header_len()) - */ int min_mtu = ETH_DATA_LEN; - int max_header_len = batadv_max_header_len(); - - if (atomic_read(&bat_priv->fragmentation)) - goto out; rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@ -286,22 +279,40 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) if (hard_iface->soft_iface != soft_iface) continue; - min_mtu = min_t(int, hard_iface->net_dev->mtu - max_header_len, - min_mtu); + min_mtu = min_t(int, hard_iface->net_dev->mtu, min_mtu); } rcu_read_unlock(); + + atomic_set(&bat_priv->packet_size_max, min_mtu); + + if (atomic_read(&bat_priv->fragmentation) == 0) + goto out; + + /* with fragmentation enabled the maximum size of internally generated + * packets such as translation table exchanges or tvlv containers, etc + * has to be calculated + */ + min_mtu = min_t(int, min_mtu, BATADV_FRAG_MAX_FRAG_SIZE); + min_mtu -= sizeof(struct batadv_frag_packet); + min_mtu *= BATADV_FRAG_MAX_FRAGMENTS; + atomic_set(&bat_priv->packet_size_max, min_mtu); + + /* with fragmentation enabled we can fragment external packets easily */ + min_mtu = min_t(int, min_mtu, ETH_DATA_LEN); + out: - return min_mtu; + return min_mtu - batadv_max_header_len(); } /* adjusts the MTU if a new interface with a smaller MTU appeared. */ void batadv_update_min_mtu(struct net_device *soft_iface) { - int min_mtu; + soft_iface->mtu = batadv_hardif_min_mtu(soft_iface); - min_mtu = batadv_hardif_min_mtu(soft_iface); - if (soft_iface->mtu != min_mtu) - soft_iface->mtu = min_mtu; + /* Check if the local translate table should be cleaned up to match a + * new (and smaller) MTU. + */ + batadv_tt_local_resize_to_mtu(soft_iface); } static void diff --git a/soft-interface.c b/soft-interface.c index bafc811..a1f00e8 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -166,7 +166,7 @@ static int batadv_interface_tx(struct sk_buff *skb, unsigned int header_len = 0; int data_len = skb->len, ret; unsigned long brd_delay = 1; - bool do_bcast = false; + bool do_bcast = false, client_added; unsigned short vid; uint32_t seqno; @@ -196,9 +196,12 @@ static int batadv_interface_tx(struct sk_buff *skb, ethhdr = (struct ethhdr *)skb->data; /* Register the client MAC in the transtable */ - if (!is_multicast_ether_addr(ethhdr->h_source)) - batadv_tt_local_add(soft_iface, ethhdr->h_source, vid, - skb->skb_iif); + if (!is_multicast_ether_addr(ethhdr->h_source)) { + client_added = batadv_tt_local_add(soft_iface, ethhdr->h_source, + vid, skb->skb_iif); + if (!client_added) + goto dropped; + } /* don't accept stp packets. STP does not help in meshes. * better use the bridge loop avoidance ... @@ -674,6 +677,7 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->log_level, 0); #endif atomic_set(&bat_priv->fragmentation, 1); + atomic_set(&bat_priv->packet_size_max, ETH_DATA_LEN); atomic_set(&bat_priv->bcast_queue_left, BATADV_BCAST_QUEUE_LEN); atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN); diff --git a/translation-table.c b/translation-table.c index 2dc214c..f997709 100644 --- a/translation-table.c +++ b/translation-table.c @@ -401,6 +401,35 @@ static uint16_t batadv_tt_entries(uint16_t tt_len) return tt_len / batadv_tt_len(1); } +/** + * batadv_tt_local_table_transmit_size - calculates the local translation table + * size when transmitted over the air + * @bat_priv: the bat priv with all the soft interface information + * + * Returns local translation table size in bytes. + */ +static int batadv_tt_local_table_transmit_size(struct batadv_priv *bat_priv) +{ + uint16_t num_vlan = 0, tt_local_entries = 0; + struct batadv_softif_vlan *vlan; + int hdr_size; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + num_vlan++; + tt_local_entries += atomic_read(&vlan->tt.num_entries); + } + rcu_read_unlock(); + + /* header size of tvlv encapsulated tt response payload */ + hdr_size = sizeof(struct batadv_unicast_tvlv_packet); + hdr_size += sizeof(struct batadv_tvlv_hdr); + hdr_size += sizeof(struct batadv_tvlv_tt_data); + hdr_size += num_vlan * sizeof(struct batadv_tvlv_tt_vlan_data); + + return hdr_size + batadv_tt_len(tt_local_entries); +} + static int batadv_tt_local_init(struct batadv_priv *bat_priv) { if (bat_priv->tt.local_hash) @@ -439,8 +468,10 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv, * @vid: VLAN identifier * @ifindex: index of the interface where the client is connected to (useful to * identify wireless clients) + * + * Returns true if the client was successfully added, false otherwise. */ -void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, +bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, unsigned short vid, int ifindex) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); @@ -448,8 +479,8 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, struct batadv_tt_global_entry *tt_global; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry; - int hash_added; - bool roamed_back = false; + int hash_added, table_size, packet_size_max; + bool ret = false, roamed_back = false; tt_local = batadv_tt_local_hash_find(bat_priv, addr, vid); tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid); @@ -484,6 +515,17 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, goto check_roaming; } + /* Ignore the client if we cannot send it in a full table response. */ + table_size = batadv_tt_local_table_transmit_size(bat_priv); + table_size += batadv_tt_len(1); + packet_size_max = atomic_read(&bat_priv->packet_size_max); + if (table_size > packet_size_max) { + net_ratelimited_function(batadv_info, soft_iface, + "Local translation table size (%i) exceeds maximum packet size (%i); Ignoring new local tt entry: %pM\n", + table_size, packet_size_max, addr); + goto out; + } + tt_local = kmalloc(sizeof(*tt_local), GFP_ATOMIC); if (!tt_local) goto out; @@ -550,11 +592,14 @@ check_roaming: } } + ret = true; + out: if (tt_local) batadv_tt_local_entry_free_ref(tt_local); if (tt_global) batadv_tt_global_entry_free_ref(tt_global); + return ret; } /** @@ -926,8 +971,16 @@ out: return curr_flags; } +/** + * batadv_tt_local_purge_list - purge inactive tt local entries + * @bat_priv: the bat priv with all the soft interface information + * @head: pointer to the list containing the local tt entries + * @timeout: parameter deciding whether a given tt local entry is considered + * inactive or not + */ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, - struct hlist_head *head) + struct hlist_head *head, + int timeout) { struct batadv_tt_local_entry *tt_local_entry; struct batadv_tt_common_entry *tt_common_entry; @@ -945,8 +998,7 @@ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) continue; - if (!batadv_has_timed_out(tt_local_entry->last_seen, - BATADV_TT_LOCAL_TIMEOUT)) + if (!batadv_has_timed_out(tt_local_entry->last_seen, timeout)) continue; batadv_tt_local_set_pending(bat_priv, tt_local_entry, @@ -954,7 +1006,14 @@ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, } } -static void batadv_tt_local_purge(struct batadv_priv *bat_priv) +/** + * batadv_tt_local_purge - purge inactive tt local entries + * @bat_priv: the bat priv with all the soft interface information + * @timeout: parameter deciding whether a given tt local entry is considered + * inactive or not + */ +static void batadv_tt_local_purge(struct batadv_priv *bat_priv, + int timeout) { struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct hlist_head *head; @@ -966,7 +1025,7 @@ static void batadv_tt_local_purge(struct batadv_priv *bat_priv) list_lock = &hash->list_locks[i]; spin_lock_bh(list_lock); - batadv_tt_local_purge_list(bat_priv, head); + batadv_tt_local_purge_list(bat_priv, head, timeout); spin_unlock_bh(list_lock); } } @@ -2370,6 +2429,15 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, req_dst_orig_node); } + /* Don't send the response, if larger than fragmented packet. */ + tt_len = sizeof(struct batadv_unicast_tvlv_packet) + tvlv_len; + if (tt_len > atomic_read(&bat_priv->packet_size_max)) { + net_ratelimited_function(batadv_info, bat_priv->soft_iface, + "Ignoring TT_REQUEST from %pM; Response size exceeds max packet size.\n", + res_dst_orig_node->orig); + goto out; + } + tvlv_tt_data->flags = BATADV_TT_RESPONSE; tvlv_tt_data->ttvn = req_ttvn; @@ -2846,7 +2914,7 @@ static void batadv_tt_purge(struct work_struct *work) priv_tt = container_of(delayed_work, struct batadv_priv_tt, work); bat_priv = container_of(priv_tt, struct batadv_priv, tt); - batadv_tt_local_purge(bat_priv); + batadv_tt_local_purge(bat_priv, BATADV_TT_LOCAL_TIMEOUT); batadv_tt_global_purge(bat_priv); batadv_tt_req_purge(bat_priv); batadv_tt_roam_purge(bat_priv); @@ -2959,18 +3027,18 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) } /** - * batadv_tt_local_commit_changes - commit all pending local tt changes which - * have been queued in the time since the last commit + * batadv_tt_local_commit_changes_nolock - commit all pending local tt changes + * which have been queued in the time since the last commit * @bat_priv: the bat priv with all the soft interface information + * + * Caller must hold tt->commit_lock. */ -void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) +static void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv) { - spin_lock_bh(&bat_priv->tt.commit_lock); - if (atomic_read(&bat_priv->tt.local_changes) < 1) { if (!batadv_atomic_dec_not_zero(&bat_priv->tt.ogm_append_cnt)) batadv_tt_tvlv_container_update(bat_priv); - goto out; + return; } batadv_tt_local_set_flags(bat_priv, BATADV_TT_CLIENT_NEW, false, true); @@ -2987,8 +3055,17 @@ void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) /* reset the sending counter */ atomic_set(&bat_priv->tt.ogm_append_cnt, BATADV_TT_OGM_APPEND_MAX); batadv_tt_tvlv_container_update(bat_priv); +} -out: +/** + * batadv_tt_local_commit_changes - commit all pending local tt changes which + * have been queued in the time since the last commit + * @bat_priv: the bat priv with all the soft interface information + */ +void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) +{ + spin_lock_bh(&bat_priv->tt.commit_lock); + batadv_tt_local_commit_changes_nolock(bat_priv); spin_unlock_bh(&bat_priv->tt.commit_lock); } @@ -3184,6 +3261,47 @@ out: } /** + * batadv_tt_local_resize_to_mtu - resize the local translation table fit the + * maximum packet size that can be transported through the mesh + * @soft_iface: netdev struct of the mesh interface + * + * Remove entries older than 'timeout' and half timeout if more entries need + * to be removed. + */ +void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface) +{ + struct batadv_priv *bat_priv = netdev_priv(soft_iface); + int packet_size_max = atomic_read(&bat_priv->packet_size_max); + int table_size, timeout = BATADV_TT_LOCAL_TIMEOUT / 2; + bool reduced = false; + + spin_lock_bh(&bat_priv->tt.commit_lock); + + while (true) { + table_size = batadv_tt_local_table_transmit_size(bat_priv); + if (packet_size_max >= table_size) + break; + + batadv_tt_local_purge(bat_priv, timeout); + batadv_tt_local_purge_pending_clients(bat_priv); + + timeout /= 2; + reduced = true; + net_ratelimited_function(batadv_info, soft_iface, + "Forced to purge local tt entries to fit new maximum fragment MTU (%i)\n", + packet_size_max); + } + + /* commit these changes immediately, to avoid synchronization problem + * with the TTVN + */ + if (reduced) + batadv_tt_local_commit_changes_nolock(bat_priv); + + spin_unlock_bh(&bat_priv->tt.commit_lock); +} + +/** * batadv_tt_tvlv_ogm_handler_v1 - process incoming tt tvlv container * @bat_priv: the bat priv with all the soft interface information * @orig: the orig_node of the ogm diff --git a/translation-table.h b/translation-table.h index dc6db4e..026b1ff 100644 --- a/translation-table.h +++ b/translation-table.h @@ -21,7 +21,7 @@ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ int batadv_tt_init(struct batadv_priv *bat_priv); -void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, +bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, unsigned short vid, int ifindex); uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr, unsigned short vid, @@ -45,6 +45,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, uint8_t *addr, unsigned short vid); bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, uint8_t *addr, unsigned short vid); +void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface); bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *addr, diff --git a/types.h b/types.h index 91c060e..c0761a4 100644 --- a/types.h +++ b/types.h @@ -612,6 +612,8 @@ struct batadv_softif_vlan { * @aggregated_ogms: bool indicating whether OGM aggregation is enabled * @bonding: bool indicating whether traffic bonding is enabled * @fragmentation: bool indicating whether traffic fragmentation is enabled + * @packet_size_max: max packet size that can be transmitted via + * multiple fragmented skbs or a single frame if fragmentation is disabled * @frag_seqno: incremental counter to identify chains of egress fragments * @bridge_loop_avoidance: bool indicating whether bridge loop avoidance is * enabled @@ -658,6 +660,7 @@ struct batadv_priv { atomic_t aggregated_ogms; atomic_t bonding; atomic_t fragmentation; + atomic_t packet_size_max; atomic_t frag_seqno; #ifdef CONFIG_BATMAN_ADV_BLA atomic_t bridge_loop_avoidance;

1 0

[batman-adv] master: batman-adv: limit local translation table max size (fb8d7c7)
by postmaster＠open-mesh.org 03 Sep '13

03 Sep '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit fb8d7c75b64ec815f2cb16a5900f06065cf07878 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon May 27 15:33:25 2013 +0800 batman-adv: limit local translation table max size The local translation table size is limited by what can be transferred from one node to another via a full table request. The number of entries fitting into a full table request depend on whether the fragmentation is enabled or not. Therefore this patch introduces a max table size check and refuses to add more local clients when that size is reached. Moreover, if the max full table packet size changes (MTU change or fragmentation is disabled) the local table is downsized instantaneously. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> >--------------------------------------------------------------- fb8d7c75b64ec815f2cb16a5900f06065cf07878 hard-interface.c | 41 ++++++++------ soft-interface.c | 12 +++-- translation-table.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------ translation-table.h | 3 +- types.h | 3 ++ 5 files changed, 172 insertions(+), 35 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index c5f871f..c60d3ed 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -266,16 +266,9 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev) int batadv_hardif_min_mtu(struct net_device *soft_iface) { - const struct batadv_priv *bat_priv = netdev_priv(soft_iface); + struct batadv_priv *bat_priv = netdev_priv(soft_iface); const struct batadv_hard_iface *hard_iface; - /* allow big frames if all devices are capable to do so - * (have MTU > 1500 + batadv_max_header_len()) - */ int min_mtu = ETH_DATA_LEN; - int max_header_len = batadv_max_header_len(); - - if (atomic_read(&bat_priv->fragmentation)) - goto out; rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@ -286,22 +279,40 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) if (hard_iface->soft_iface != soft_iface) continue; - min_mtu = min_t(int, hard_iface->net_dev->mtu - max_header_len, - min_mtu); + min_mtu = min_t(int, hard_iface->net_dev->mtu, min_mtu); } rcu_read_unlock(); + + atomic_set(&bat_priv->packet_size_max, min_mtu); + + if (atomic_read(&bat_priv->fragmentation) == 0) + goto out; + + /* with fragmentation enabled the maximum size of internally generated + * packets such as translation table exchanges or tvlv containers, etc + * has to be calculated + */ + min_mtu = min_t(int, min_mtu, BATADV_FRAG_MAX_FRAG_SIZE); + min_mtu -= sizeof(struct batadv_frag_packet); + min_mtu *= BATADV_FRAG_MAX_FRAGMENTS; + atomic_set(&bat_priv->packet_size_max, min_mtu); + + /* with fragmentation enabled we can fragment external packets easily */ + min_mtu = min_t(int, min_mtu, ETH_DATA_LEN); + out: - return min_mtu; + return min_mtu - batadv_max_header_len(); } /* adjusts the MTU if a new interface with a smaller MTU appeared. */ void batadv_update_min_mtu(struct net_device *soft_iface) { - int min_mtu; + soft_iface->mtu = batadv_hardif_min_mtu(soft_iface); - min_mtu = batadv_hardif_min_mtu(soft_iface); - if (soft_iface->mtu != min_mtu) - soft_iface->mtu = min_mtu; + /* Check if the local translate table should be cleaned up to match a + * new (and smaller) MTU. + */ + batadv_tt_local_resize_to_mtu(soft_iface); } static void diff --git a/soft-interface.c b/soft-interface.c index bafc811..a1f00e8 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -166,7 +166,7 @@ static int batadv_interface_tx(struct sk_buff *skb, unsigned int header_len = 0; int data_len = skb->len, ret; unsigned long brd_delay = 1; - bool do_bcast = false; + bool do_bcast = false, client_added; unsigned short vid; uint32_t seqno; @@ -196,9 +196,12 @@ static int batadv_interface_tx(struct sk_buff *skb, ethhdr = (struct ethhdr *)skb->data; /* Register the client MAC in the transtable */ - if (!is_multicast_ether_addr(ethhdr->h_source)) - batadv_tt_local_add(soft_iface, ethhdr->h_source, vid, - skb->skb_iif); + if (!is_multicast_ether_addr(ethhdr->h_source)) { + client_added = batadv_tt_local_add(soft_iface, ethhdr->h_source, + vid, skb->skb_iif); + if (!client_added) + goto dropped; + } /* don't accept stp packets. STP does not help in meshes. * better use the bridge loop avoidance ... @@ -674,6 +677,7 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->log_level, 0); #endif atomic_set(&bat_priv->fragmentation, 1); + atomic_set(&bat_priv->packet_size_max, ETH_DATA_LEN); atomic_set(&bat_priv->bcast_queue_left, BATADV_BCAST_QUEUE_LEN); atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN); diff --git a/translation-table.c b/translation-table.c index 2dc214c..c1e6cdf 100644 --- a/translation-table.c +++ b/translation-table.c @@ -401,6 +401,35 @@ static uint16_t batadv_tt_entries(uint16_t tt_len) return tt_len / batadv_tt_len(1); } +/** + * batadv_tt_local_table_transmit_size - calculates the local translation table + * size when transmitted over the air + * @bat_priv: the bat priv with all the soft interface information + * + * Returns local translation table size in bytes. + */ +static int batadv_tt_local_table_transmit_size(struct batadv_priv *bat_priv) +{ + uint16_t num_vlan = 0, tt_local_entries = 0; + struct batadv_softif_vlan *vlan; + int hdr_size; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + num_vlan++; + tt_local_entries += atomic_read(&vlan->tt.num_entries); + } + rcu_read_unlock(); + + /* header size of tvlv encapsulated tt response payload */ + hdr_size = sizeof(struct batadv_unicast_tvlv_packet); + hdr_size += sizeof(struct batadv_tvlv_hdr); + hdr_size += sizeof(struct batadv_tvlv_tt_data); + hdr_size += num_vlan * sizeof(struct batadv_tvlv_tt_vlan_data); + + return hdr_size + batadv_tt_len(tt_local_entries); +} + static int batadv_tt_local_init(struct batadv_priv *bat_priv) { if (bat_priv->tt.local_hash) @@ -439,8 +468,10 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv, * @vid: VLAN identifier * @ifindex: index of the interface where the client is connected to (useful to * identify wireless clients) + * + * Returns true if the client was successfully added, false otherwise. */ -void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, +bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, unsigned short vid, int ifindex) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); @@ -448,8 +479,8 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, struct batadv_tt_global_entry *tt_global; struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry; - int hash_added; - bool roamed_back = false; + int hash_added, table_size, packet_size_max; + bool ret = false, roamed_back = false; tt_local = batadv_tt_local_hash_find(bat_priv, addr, vid); tt_global = batadv_tt_global_hash_find(bat_priv, addr, vid); @@ -484,6 +515,17 @@ void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, goto check_roaming; } + /* Ignore the client if we cannot send it in a full table response. */ + table_size = batadv_tt_local_table_transmit_size(bat_priv); + table_size += batadv_tt_len(1); + packet_size_max = atomic_read(&bat_priv->packet_size_max); + if (table_size > packet_size_max) { + net_ratelimited_function(batadv_info, soft_iface, + "Local translation table size (%i) exceeds maximum packet size (%i); Ignoring new local tt entry: %pM\n", + table_size, packet_size_max, addr); + goto out; + } + tt_local = kmalloc(sizeof(*tt_local), GFP_ATOMIC); if (!tt_local) goto out; @@ -550,11 +592,14 @@ check_roaming: } } + ret = true; + out: if (tt_local) batadv_tt_local_entry_free_ref(tt_local); if (tt_global) batadv_tt_global_entry_free_ref(tt_global); + return ret; } /** @@ -926,8 +971,16 @@ out: return curr_flags; } +/** + * batadv_tt_local_purge_list - purge inactive tt local entries + * @bat_priv: the bat priv with all the soft interface information + * @head: pointer to the list containing the local tt entries + * @timeout: parameter deciding whether a given tt local entry is considered + * inactive or not + */ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, - struct hlist_head *head) + struct hlist_head *head, + int timeout) { struct batadv_tt_local_entry *tt_local_entry; struct batadv_tt_common_entry *tt_common_entry; @@ -945,8 +998,7 @@ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, if (tt_local_entry->common.flags & BATADV_TT_CLIENT_PENDING) continue; - if (!batadv_has_timed_out(tt_local_entry->last_seen, - BATADV_TT_LOCAL_TIMEOUT)) + if (!batadv_has_timed_out(tt_local_entry->last_seen, timeout)) continue; batadv_tt_local_set_pending(bat_priv, tt_local_entry, @@ -954,7 +1006,14 @@ static void batadv_tt_local_purge_list(struct batadv_priv *bat_priv, } } -static void batadv_tt_local_purge(struct batadv_priv *bat_priv) +/** + * batadv_tt_local_purge - purge inactive tt local entries + * @bat_priv: the bat priv with all the soft interface information + * @timeout: parameter deciding whether a given tt local entry is considered + * inactive or not + */ +static void batadv_tt_local_purge(struct batadv_priv *bat_priv, + int timeout) { struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct hlist_head *head; @@ -966,7 +1025,7 @@ static void batadv_tt_local_purge(struct batadv_priv *bat_priv) list_lock = &hash->list_locks[i]; spin_lock_bh(list_lock); - batadv_tt_local_purge_list(bat_priv, head); + batadv_tt_local_purge_list(bat_priv, head, timeout); spin_unlock_bh(list_lock); } } @@ -2370,6 +2429,15 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, req_dst_orig_node); } + /* Don't send the response, if larger than fragmented packet. */ + tt_len = sizeof(struct batadv_unicast_tvlv_packet) + tvlv_len; + if (tt_len > atomic_read(&bat_priv->packet_size_max)) { + net_ratelimited_function(batadv_info, bat_priv->soft_iface, + "Ignoring TT_REQUEST from %pM; Response size exceeds max packet size.\n", + res_dst_orig_node->orig); + goto out; + } + tvlv_tt_data->flags = BATADV_TT_RESPONSE; tvlv_tt_data->ttvn = req_ttvn; @@ -2846,7 +2914,7 @@ static void batadv_tt_purge(struct work_struct *work) priv_tt = container_of(delayed_work, struct batadv_priv_tt, work); bat_priv = container_of(priv_tt, struct batadv_priv, tt); - batadv_tt_local_purge(bat_priv); + batadv_tt_local_purge(bat_priv, BATADV_TT_LOCAL_TIMEOUT); batadv_tt_global_purge(bat_priv); batadv_tt_req_purge(bat_priv); batadv_tt_roam_purge(bat_priv); @@ -2959,18 +3027,18 @@ static void batadv_tt_local_purge_pending_clients(struct batadv_priv *bat_priv) } /** - * batadv_tt_local_commit_changes - commit all pending local tt changes which + * batadv_tt_local_commit_changes_nolock - commit all pending local tt changes which * have been queued in the time since the last commit * @bat_priv: the bat priv with all the soft interface information + * + * Caller must hold tt->commit_lock. */ -void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) +void batadv_tt_local_commit_changes_nolock(struct batadv_priv *bat_priv) { - spin_lock_bh(&bat_priv->tt.commit_lock); - if (atomic_read(&bat_priv->tt.local_changes) < 1) { if (!batadv_atomic_dec_not_zero(&bat_priv->tt.ogm_append_cnt)) batadv_tt_tvlv_container_update(bat_priv); - goto out; + return; } batadv_tt_local_set_flags(bat_priv, BATADV_TT_CLIENT_NEW, false, true); @@ -2987,8 +3055,17 @@ void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) /* reset the sending counter */ atomic_set(&bat_priv->tt.ogm_append_cnt, BATADV_TT_OGM_APPEND_MAX); batadv_tt_tvlv_container_update(bat_priv); +} -out: +/** + * batadv_tt_local_commit_changes - commit all pending local tt changes which + * have been queued in the time since the last commit + * @bat_priv: the bat priv with all the soft interface information + */ +void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) +{ + spin_lock_bh(&bat_priv->tt.commit_lock); + batadv_tt_local_commit_changes_nolock(bat_priv); spin_unlock_bh(&bat_priv->tt.commit_lock); } @@ -3184,6 +3261,47 @@ out: } /** + * batadv_tt_local_resize_to_mtu - resize the local translation table fit the + * maximum packet size that can be transported through the mesh + * @soft_iface: netdev struct of the mesh interface + * + * Remove entries older than 'timeout' and half timeout if more entries need + * to be removed. + */ +void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface) +{ + struct batadv_priv *bat_priv = netdev_priv(soft_iface); + int packet_size_max = atomic_read(&bat_priv->packet_size_max); + int table_size, timeout = BATADV_TT_LOCAL_TIMEOUT / 2; + bool reduced = false; + + spin_lock_bh(&bat_priv->tt.commit_lock); + + while (true) { + table_size = batadv_tt_local_table_transmit_size(bat_priv); + if (packet_size_max >= table_size) + break; + + batadv_tt_local_purge(bat_priv, timeout); + batadv_tt_local_purge_pending_clients(bat_priv); + + timeout /= 2; + reduced = true; + net_ratelimited_function(batadv_info, soft_iface, + "Forced to purge local tt entries to fit new maximum fragment MTU (%i)\n", + packet_size_max); + } + + /* commit these changes immediately, to avoid synchronization problem + * with the TTVN + */ + if (reduced) + batadv_tt_local_commit_changes_nolock(bat_priv); + + spin_unlock_bh(&bat_priv->tt.commit_lock); +} + +/** * batadv_tt_tvlv_ogm_handler_v1 - process incoming tt tvlv container * @bat_priv: the bat priv with all the soft interface information * @orig: the orig_node of the ogm diff --git a/translation-table.h b/translation-table.h index dc6db4e..026b1ff 100644 --- a/translation-table.h +++ b/translation-table.h @@ -21,7 +21,7 @@ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ int batadv_tt_init(struct batadv_priv *bat_priv); -void batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, +bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr, unsigned short vid, int ifindex); uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr, unsigned short vid, @@ -45,6 +45,7 @@ bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv, uint8_t *addr, unsigned short vid); bool batadv_tt_local_client_is_roaming(struct batadv_priv *bat_priv, uint8_t *addr, unsigned short vid); +void batadv_tt_local_resize_to_mtu(struct net_device *soft_iface); bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *addr, diff --git a/types.h b/types.h index 91c060e..c0761a4 100644 --- a/types.h +++ b/types.h @@ -612,6 +612,8 @@ struct batadv_softif_vlan { * @aggregated_ogms: bool indicating whether OGM aggregation is enabled * @bonding: bool indicating whether traffic bonding is enabled * @fragmentation: bool indicating whether traffic fragmentation is enabled + * @packet_size_max: max packet size that can be transmitted via + * multiple fragmented skbs or a single frame if fragmentation is disabled * @frag_seqno: incremental counter to identify chains of egress fragments * @bridge_loop_avoidance: bool indicating whether bridge loop avoidance is * enabled @@ -658,6 +660,7 @@ struct batadv_priv { atomic_t aggregated_ogms; atomic_t bonding; atomic_t fragmentation; + atomic_t packet_size_max; atomic_t frag_seqno; #ifdef CONFIG_BATMAN_ADV_BLA atomic_t bridge_loop_avoidance;

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2013