B.A.T.M.A.N July 2014

b.a.t.m.a.n@lists.open-mesh.org

22 participants
43 discussions

[B.A.T.M.A.N.] [PATCH 1/2] alfred: Print libc errors with perror
by Sven Eckelmann 29 Jul '14

29 Jul '14

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- debugfs.c | 4 +--- gpsd/alfred-gpsd.c | 9 +++------ netsock.c | 12 ++++++------ recv.c | 3 +-- server.c | 11 ++++------- unix_sock.c | 21 +++++++-------------- vis/vis.c | 10 ++++------ 7 files changed, 26 insertions(+), 44 deletions(-) diff --git a/debugfs.c b/debugfs.c index 4b8801a..fbf992e 100644 --- a/debugfs.c +++ b/debugfs.c @@ -89,9 +89,7 @@ static const char *debugfs_find_mountpoint(void) /* give up and parse /proc/mounts */ fp = fopen("/proc/mounts", "r"); if (fp == NULL) { - fprintf(stderr, - "Error - can't open /proc/mounts for read: %s\n", - strerror(errno)); + perror("Error - can't open /proc/mounts for read"); return NULL; } diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 06c0680..6e88dc7 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -29,8 +29,7 @@ static int alfred_open_sock(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -41,8 +40,7 @@ static int alfred_open_sock(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't connect to unix socket: %s\n", - strerror(errno)); + perror("can't connect to unix socket"); return -1; } @@ -514,8 +512,7 @@ static int gpsd_server(struct globals *globals) errno = 0; ret = select(max_fd, &fds, NULL, NULL, &tv); if (ret == -1 && errno != EINTR) - printf("select error %s(%d)\n", - strerror(errno), errno); + perror("select error"); if (ret == 1) gpsd_read_gpsd(globals); diff --git a/netsock.c b/netsock.c index 305983f..a1a97e4 100644 --- a/netsock.c +++ b/netsock.c @@ -54,7 +54,7 @@ int netsock_open(struct globals *globals) sock = socket(PF_INET6, SOCK_DGRAM, 0); if (sock < 0) { - fprintf(stderr, "can't open socket: %s\n", strerror(errno)); + perror("can't open socket"); return -1; } @@ -62,7 +62,7 @@ int netsock_open(struct globals *globals) strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { - fprintf(stderr, "can't get interface: %s\n", strerror(errno)); + perror("can't get interface"); goto err; } @@ -75,7 +75,7 @@ int netsock_open(struct globals *globals) sin6.sin6_scope_id = ifr.ifr_ifindex; if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { - fprintf(stderr, "can't get MAC address: %s\n", strerror(errno)); + perror("can't get MAC address"); goto err; } @@ -83,19 +83,19 @@ int netsock_open(struct globals *globals) mac_to_ipv6(&globals->hwaddr, &globals->address); if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { - fprintf(stderr, "can't bind\n"); + perror("can't bind"); goto err; } ret = fcntl(sock, F_GETFL, 0); if (ret < 0) { - fprintf(stderr, "failed to get file status flags\n"); + perror("failed to get file status flags"); goto err; } ret = fcntl(sock, F_SETFL, ret | O_NONBLOCK); if (ret < 0) { - fprintf(stderr, "failed to set file status flags\n"); + perror("failed to set file status flags"); goto err; } diff --git a/recv.c b/recv.c index 724c551..2948547 100644 --- a/recv.c +++ b/recv.c @@ -385,8 +385,7 @@ int recv_alfred_packet(struct globals *globals) length = recvfrom(globals->netsock, buf, sizeof(buf), 0, (struct sockaddr *)&source, &sourcelen); if (length <= 0) { - fprintf(stderr, "read from network socket failed: %s\n", - strerror(errno)); + perror("read from network socket failed"); return -1; } diff --git a/server.c b/server.c index b060d55..94e6145 100644 --- a/server.c +++ b/server.c @@ -236,7 +236,7 @@ static void check_if_socket(struct globals *globals) sock = socket(PF_INET6, SOCK_DGRAM, 0); if (sock < 0) { - fprintf(stderr, "can't open socket: %s\n", strerror(errno)); + perror("can't open socket"); return; } @@ -244,8 +244,7 @@ static void check_if_socket(struct globals *globals) strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { - fprintf(stderr, "can't get interface: %s, closing netsock\n", - strerror(errno)); + perror("can't get interface, closing netsock"); goto close; } @@ -257,8 +256,7 @@ static void check_if_socket(struct globals *globals) } if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { - fprintf(stderr, "can't get MAC address: %s, closing netsock\n", - strerror(errno)); + perror("can't get MAC address, closing netsock"); goto close; } @@ -330,8 +328,7 @@ int alfred_server(struct globals *globals) ret = pselect(maxsock + 1, &fds, NULL, &errfds, &tv, NULL); if (ret == -1) { - fprintf(stderr, "main loop select failed ...: %s\n", - strerror(errno)); + perror("main loop select failed ..."); } else if (ret) { if (globals->netsock >= 0 && FD_ISSET(globals->netsock, &errfds)) { diff --git a/unix_sock.c b/unix_sock.c index fb7e391..cc0d25c 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -43,8 +43,7 @@ int unix_sock_open_daemon(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -55,14 +54,12 @@ int unix_sock_open_daemon(struct globals *globals) if (bind(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't bind unix socket: %s\n", - strerror(errno)); + perror("can't bind unix socket"); return -1; } if (listen(globals->unix_sock, 10) < 0) { - fprintf(stderr, "can't listen on unix socket: %s\n", - strerror(errno)); + perror("can't listen on unix socket"); return -1; } @@ -75,8 +72,7 @@ int unix_sock_open_client(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -87,8 +83,7 @@ int unix_sock_open_client(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't connect to unix socket: %s\n", - strerror(errno)); + perror("can't connect to unix socket"); return -1; } @@ -315,16 +310,14 @@ int unix_sock_read(struct globals *globals) client_sock = accept(globals->unix_sock, (struct sockaddr *)&sun_addr, &sun_size); if (client_sock < 0) { - fprintf(stderr, "can't accept unix connection: %s\n", - strerror(errno)); + perror("can't accept unix connection"); return -1; } /* we assume that we can instantly read here. */ length = read(client_sock, buf, sizeof(buf)); if (length <= 0) { - fprintf(stderr, "read from unix socket failed: %s\n", - strerror(errno)); + perror("read from unix socket failed"); goto err; } diff --git a/vis/vis.c b/vis/vis.c index 0cc4981..6cc4034 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -108,7 +108,7 @@ static int get_if_mac(char *ifname, uint8_t *mac) ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { - fprintf(stderr, "can't get interface: %s\n", strerror(errno)); + perror("can't get interface"); return -1; } @@ -117,7 +117,7 @@ static int get_if_mac(char *ifname, uint8_t *mac) close(sock); if (ret == -1) { - fprintf(stderr, "can't get MAC address: %s\n", strerror(errno)); + perror("can't get MAC address"); return -1; } @@ -162,8 +162,7 @@ static int alfred_open_sock(struct globals *globals) globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { - fprintf(stderr, "can't create unix socket: %s\n", - strerror(errno)); + perror("can't create unix socket"); return -1; } @@ -174,8 +173,7 @@ static int alfred_open_sock(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - fprintf(stderr, "can't connect to unix socket: %s\n", - strerror(errno)); + perror("can't connect to unix socket"); return -1; } -- 2.0.1

3 3

[B.A.T.M.A.N.] non DHCP batman-adv gateway
by Gabriel Tolón 29 Jul '14

29 Jul '14

Hi, I'd like to use a configuration in a batman-adv openwrt mesh network in which the batman gateway relays the DHCP messages to and from a non batman-adv router. I think that's not a typical configuration right? Should it work? Do I need some additional packages? Thanks in advance! Gabriel

2 3

[B.A.T.M.A.N.] Opportunity to contribute in B.A.T.M.A.N
by Dhruvesh Rathore 29 Jul '14

29 Jul '14

Hello, We are a group of students that are currently pursuing our undergraduate degrees in Computer Science form Pune Institute of Computer Technology (PICT), Maharashtra, India. We will be graduating in June 2015 and are currently in our final year. For our final year B.E project we have selected the domain as Computer Networks and would be very interested in working in the field of routing protocols for multihop ad-hoc mesh networks, which is where we stumbled upon the B.A.T.M.A.N protocol. Over the past few weeks we have been extensively studying the various features and working principles which has allowed this protocol to prosper. It will be a great learning opportunity for us to work with B.A.T.M.A.N and in turn work with you. As per given on the open-mesh.org website for contributions, we would appreciate if you could steer us towards the direction of choosing the right topic and working towards culminating a project in the same, which would be helpful for the community. Following are a few details which includes information about us, which would help you in making an informed decision: 1) Group name: A-DRS It is our constant belief that inquisitiveness is the best teacher. For each one of us, coming together as a group has allowed us to begin the journey of learning and innovating. We have been working together since December 2012 and have completed numerous projects in our college and for organizations, some of which you can view at out GitHub account link : ( https://github.com/a-drs?tab=contributions&from=2014-07-18 ). 2) Group members: Amey Ruikar ( ameyruikar(a)yahoo.com , in.linkedin.com/pub/amey-ruikar/9a/315/1b7/ ) Dhruvesh Rathore (dhruvesh_r(a)outlook.com , in.linkedin.com/pub/dhruvesh-rathore/9a/550/56a/ ) Somdeep Dey (somdeepdey10(a)gmail.com , in.linkedin.com/pub/somdeep-dey/a0/124/bb7/) 3) We have two mentors working with us, who will be guiding us throughout the process Nafisa Mandliwala (nafisa.madliwala(a)gmail.com) Swapnil Pimpale (pimplae.swapnil(a)gmail.com) 4) Development time ( 6 to 7 months from August'14 to February'15 ) We would love to hear from you about any ideas that you see fit for us to pursue and which are feasible in the specified time frame. Hoping to hear from you soon, and thanking you in anticipation. Regards.

2 1

[B.A.T.M.A.N.] [PATCH] alfred: Make unix socket path configurable
by Sven Eckelmann 28 Jul '14

28 Jul '14

The path to the socket used for client-server communication is currently hardcoded in alfred and its complimentary daemons. This makes it hard to run two instances of alfred on the same machine without any kind of virtualization or containers. An user may still want to use two alfred instances to create a test setup or connect a single machine two separated alfred data clouds without exchanging data between them. Reported-by: Tobias Hachmer <tobias(a)hachmer.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- alfred.h | 7 ++++--- client.c | 6 +++--- gpsd/alfred-gpsd.c | 9 +++++++-- gpsd/alfred-gpsd.h | 3 ++- gpsd/man/alfred-gpsd.8 | 3 +++ main.c | 8 +++++++- man/alfred.8 | 3 +++ server.c | 2 +- unix_sock.c | 10 +++++----- vis/man/batadv-vis.8 | 3 +++ vis/vis.c | 10 ++++++++-- vis/vis.h | 3 ++- 12 files changed, 48 insertions(+), 19 deletions(-) diff --git a/alfred.h b/alfred.h index f0dbb6d..35ac4dd 100644 --- a/alfred.h +++ b/alfred.h @@ -35,7 +35,7 @@ #define ALFRED_REQUEST_TIMEOUT 10 #define ALFRED_SERVER_TIMEOUT 60 #define ALFRED_DATA_TIMEOUT 600 -#define ALFRED_SOCK_PATH "/var/run/alfred.sock" +#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" #define NO_FILTER -1 enum data_source { @@ -102,6 +102,7 @@ struct globals { int netsock; int unix_sock; + const char *unix_path; struct timespec if_check; @@ -144,8 +145,8 @@ ssize_t 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, const char *path); -int unix_sock_open_client(struct globals *globals, const char *path); +int unix_sock_open_daemon(struct globals *globals); +int unix_sock_open_client(struct globals *globals); int unix_sock_close(struct globals *globals); int unix_sock_req_data_finish(struct globals *globals, struct transaction_head *head); diff --git a/client.c b/client.c index cbc6867..b868719 100644 --- a/client.c +++ b/client.c @@ -40,7 +40,7 @@ int alfred_client_request_data(struct globals *globals) int ret, len, data_len, i; const size_t buf_data_len = sizeof(buf) - sizeof(*push) - sizeof(*data); - if (unix_sock_open_client(globals, ALFRED_SOCK_PATH)) + if (unix_sock_open_client(globals)) return -1; request = (struct alfred_request_v0 *)buf; @@ -146,7 +146,7 @@ int alfred_client_set_data(struct globals *globals) struct alfred_data *data; int ret, len; - if (unix_sock_open_client(globals, ALFRED_SOCK_PATH)) + if (unix_sock_open_client(globals)) return -1; push = (struct alfred_push_data_v0 *)buf; @@ -187,7 +187,7 @@ int alfred_client_modeswitch(struct globals *globals) struct alfred_modeswitch_v0 *modeswitch; int ret, len; - if (unix_sock_open_client(globals, ALFRED_SOCK_PATH)) + if (unix_sock_open_client(globals)) return -1; modeswitch = (struct alfred_modeswitch_v0 *)buf; diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 87943bd..06c0680 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -36,7 +36,7 @@ static int alfred_open_sock(struct globals *globals) memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_LOCAL; - strncpy(addr.sun_path, ALFRED_SOCK_PATH, sizeof(addr.sun_path)); + strncpy(addr.sun_path, globals->unix_path, sizeof(addr.sun_path)); addr.sun_path[sizeof(addr.sun_path) - 1] = '\0'; if (connect(globals->unix_sock, (struct sockaddr *)&addr, @@ -399,6 +399,7 @@ static struct globals *gpsd_init(int argc, char *argv[]) {"server", no_argument, NULL, 's'}, {"location", required_argument, NULL, 'l'}, {"gpsd", required_argument, NULL, 'g'}, + {"unix-path", required_argument, NULL, 'u'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'v'}, {NULL, 0, NULL, 0}, @@ -410,8 +411,9 @@ static struct globals *gpsd_init(int argc, char *argv[]) globals->opmode = OPMODE_CLIENT; globals->source = SOURCE_GPSD; globals->gpsd_format = FORMAT_JSON; + globals->unix_path = ALFRED_SOCK_PATH_DEFAULT; - while ((opt = getopt_long(argc, argv, "shl:g:v", long_options, + while ((opt = getopt_long(argc, argv, "shl:g:vu:", long_options, &opt_ind)) != -1) { switch (opt) { case 's': @@ -425,6 +427,9 @@ static struct globals *gpsd_init(int argc, char *argv[]) gpsd_source_spec(optarg, &globals->gpsdsource); have_source = true; break; + case 'u': + globals->unix_path = optarg; + break; case 'v': printf("%s %s\n", argv[0], SOURCE_VERSION); printf("GPSD alfred client\n"); diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 68da875..a8382ea 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -41,7 +41,7 @@ #define SOURCE_VERSION "2014.4.0" #endif -#define ALFRED_SOCK_PATH "/var/run/alfred.sock" +#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" #define PATH_BUFF_LEN 200 #define GPSD_PACKETTYPE 2 #define GPSD_PACKETVERSION 1 @@ -95,6 +95,7 @@ struct globals { float lat, lon, alt; int unix_sock; + const char *unix_path; struct fixsource_t gpsdsource; struct gps_data_t gpsdata; diff --git a/gpsd/man/alfred-gpsd.8 b/gpsd/man/alfred-gpsd.8 index fa5cb1f..3799293 100644 --- a/gpsd/man/alfred-gpsd.8 +++ b/gpsd/man/alfred-gpsd.8 @@ -43,6 +43,9 @@ Print the version \fB\-h\fP, \fB\-\-help\fP Display a brief help message. .TP +\fB\-u\fP, \fB\-\-unix-path\fP \fIpath\fP +path to unix socket used for alfred server communication. +.TP \fB\-s\fP, \fB\-\-server\fP Start up in server mode. This server will read the current location from gpsd and set it in alfred via unix socket. The alfred server must diff --git a/main.c b/main.c index d848589..0a79e08 100644 --- a/main.c +++ b/main.c @@ -49,6 +49,7 @@ static void alfred_usage(void) printf(" accepts data from slaves and synces it with\n"); printf(" other masters\n"); printf("\n"); + printf(" -u, --unix-path [path] path to unix socket used for client-server communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); printf(" -v, --version print the version\n"); printf(" -h, --help this help\n"); printf("\n"); @@ -66,6 +67,7 @@ static struct globals *alfred_init(int argc, char *argv[]) {"help", no_argument, NULL, 'h'}, {"req-version", required_argument, NULL, 'V'}, {"modeswitch", required_argument, NULL, 'M'}, + {"unix-path", required_argument, NULL, 'u'}, {"version", no_argument, NULL, 'v'}, {NULL, 0, NULL, 0}, }; @@ -79,10 +81,11 @@ static struct globals *alfred_init(int argc, char *argv[]) globals->best_server = NULL; globals->clientmode_version = 0; globals->mesh_iface = "bat0"; + globals->unix_path = ALFRED_SOCK_PATH_DEFAULT; time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:u:", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -132,6 +135,9 @@ static struct globals *alfred_init(int argc, char *argv[]) } globals->clientmode = CLIENT_MODESWITCH; break; + case 'u': + globals->unix_path = optarg; + 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"); diff --git a/man/alfred.8 b/man/alfred.8 index e77acc3..c90caa8 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -50,6 +50,9 @@ Print the version .TP \fB\-h\fP, \fB\-\-help\fP Display a brief help message. +.TP +\fB\-u\fP, \fB\-\-unix-path\fP \fIpath\fP +path to unix socket used for client-server communication. . .SH CLIENT OPTIONS .TP diff --git a/server.c b/server.c index e4465dc..b060d55 100644 --- a/server.c +++ b/server.c @@ -285,7 +285,7 @@ int alfred_server(struct globals *globals) if (create_hashes(globals)) return -1; - if (unix_sock_open_daemon(globals, ALFRED_SOCK_PATH)) + if (unix_sock_open_daemon(globals)) return -1; if (!globals->interface) { diff --git a/unix_sock.c b/unix_sock.c index 3915553..fb7e391 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -35,11 +35,11 @@ #include "hash.h" #include "packet.h" -int unix_sock_open_daemon(struct globals *globals, const char *path) +int unix_sock_open_daemon(struct globals *globals) { struct sockaddr_un addr; - unlink(path); + unlink(globals->unix_path); globals->unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); if (globals->unix_sock < 0) { @@ -50,7 +50,7 @@ int unix_sock_open_daemon(struct globals *globals, const char *path) memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_LOCAL; - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strncpy(addr.sun_path, globals->unix_path, sizeof(addr.sun_path)); addr.sun_path[sizeof(addr.sun_path) - 1] = '\0'; if (bind(globals->unix_sock, (struct sockaddr *)&addr, @@ -69,7 +69,7 @@ int unix_sock_open_daemon(struct globals *globals, const char *path) return 0; } -int unix_sock_open_client(struct globals *globals, const char *path) +int unix_sock_open_client(struct globals *globals) { struct sockaddr_un addr; @@ -82,7 +82,7 @@ int unix_sock_open_client(struct globals *globals, const char *path) memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_LOCAL; - strncpy(addr.sun_path, path, sizeof(addr.sun_path)); + strncpy(addr.sun_path, globals->unix_path, sizeof(addr.sun_path)); addr.sun_path[sizeof(addr.sun_path) - 1] = '\0'; if (connect(globals->unix_sock, (struct sockaddr *)&addr, diff --git a/vis/man/batadv-vis.8 b/vis/man/batadv-vis.8 index 9b7c05c..20dead7 100644 --- a/vis/man/batadv-vis.8 +++ b/vis/man/batadv-vis.8 @@ -42,6 +42,9 @@ Print the version \fB\-h\fP, \fB\-\-help\fP Display a brief help message. .TP +\fB\-u\fP, \fB\-\-unix-path\fP \fIpath\fP +path to unix socket used for alfred server communication. +.TP \fB\-i\fP, \fB\-\-interface\fP \fIiface\fP Specify the batman-adv interface configured on the system (default: bat0) .TP diff --git a/vis/vis.c b/vis/vis.c index 55c2dad..0cc4981 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -169,7 +169,7 @@ static int alfred_open_sock(struct globals *globals) memset(&addr, 0, sizeof(addr)); addr.sun_family = AF_LOCAL; - strncpy(addr.sun_path, ALFRED_SOCK_PATH, sizeof(addr.sun_path)); + strncpy(addr.sun_path, globals->unix_path, sizeof(addr.sun_path)); addr.sun_path[sizeof(addr.sun_path) - 1] = '\0'; if (connect(globals->unix_sock, (struct sockaddr *)&addr, @@ -818,6 +818,7 @@ static void vis_usage(void) printf(" -i, --interface specify the batman-adv interface configured on the system (default: bat0)\n"); printf(" -s, --server start up in server mode, which regularly updates vis data from batman-adv\n"); printf(" -f, --format <format> specify the output format for client mode (either \"json\", \"jsondoc\" or \"dot\")\n"); + printf(" -u, --unix-path <path> path to unix socket used for alfred server communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); printf(" -v, --version print the version\n"); printf(" -h, --help this help\n"); printf("\n"); @@ -831,6 +832,7 @@ static struct globals *vis_init(int argc, char *argv[]) {"server", no_argument, NULL, 's'}, {"interface", required_argument, NULL, 'i'}, {"format", required_argument, NULL, 'f'}, + {"unix-path", required_argument, NULL, 'u'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'v'}, {NULL, 0, NULL, 0}, @@ -842,8 +844,9 @@ static struct globals *vis_init(int argc, char *argv[]) globals->opmode = OPMODE_CLIENT; globals->interface = "bat0"; globals->vis_format = FORMAT_DOT; + globals->unix_path = ALFRED_SOCK_PATH_DEFAULT; - while ((opt = getopt_long(argc, argv, "shf:i:v", long_options, + while ((opt = getopt_long(argc, argv, "shf:i:vu:", long_options, &opt_ind)) != -1) { switch (opt) { case 's': @@ -864,6 +867,9 @@ static struct globals *vis_init(int argc, char *argv[]) case 'i': globals->interface = strdup(optarg); break; + case 'u': + globals->unix_path = optarg; + break; case 'v': printf("%s %s\n", argv[0], SOURCE_VERSION); printf("VIS alfred client\n"); diff --git a/vis/vis.h b/vis/vis.h index 3f71970..468bfc4 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -30,7 +30,7 @@ #define SOURCE_VERSION "2014.4.0" #endif -#define ALFRED_SOCK_PATH "/var/run/alfred.sock" +#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" #define PATH_BUFF_LEN 200 #define VIS_PACKETTYPE 1 #define VIS_PACKETVERSION 1 @@ -105,6 +105,7 @@ struct globals { struct list_head entry_list; int unix_sock; + const char *unix_path; }; -- 2.0.1

4 4

[B.A.T.M.A.N.] alfred - one gateway - multiple interfaces
by Tobias Hachmer 24 Jul '14

24 Jul '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hello list, running here 3 gateways serving two communities. Nearly everything is duplicated/separated logically: fastd, bridges, routing tables, batman domains, etc. Operating System is currently Ubuntu 14.04. alfred: Installed: 2014.1.0-1 Candidate: 2014.1.0-1 Version table: *** 2014.1.0-1 0 500 http://apt.rfc2324.org/debian/ wheezy/main amd64 Packages 100 /var/lib/dpkg/status Guess what: We have the requirement to run one alfred instance for each batman domain. What is the suggested way to achieve this? For instance, I assume that this isn't intended by design because /etc/default/alfred in conjunction with the init script aren't multiple interface aware. - From our POV the preferred solution for this would be to patch the init script in order to support multiple interfaces by reading this from /etc/default/alfred, like: INTERFACES="bridge_one bridge_two" BATMANIFS="bat_one bat_two" Just to fork multiple separated processes. Maybe this is solved elsewhere and we didn't get it, yet. Please give us your thoughts and hopefully a solution to this issue. Regards, Tobias Hachmer -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCgAGBQJT0AuvAAoJEHXGlTiIv2V4QPUP/13h9qrMX79NMUBbIDnLGt41 b1tViUzs1v8zGeYfshgER4cTNk1j7B1iikjCchojxwhGdZpXh5CuWaTzJnbSVBjA 5SxSKsRdhVetp3EBErhezhv4jW1E7QlzjIQ9BW/kBV7bxyMxvaYhn6sfTlviCH2h WTYNxtU0ACxVJ63h8c720qneTkiS8O+SGLUHSxy7v8BuCRRTJtiMBYJf3zv7jJ2D 0Zskla7ASW9leWkMgescjcYL4c2m3N+BR1m01tML5C3En49NVddAEawwcoU/RTmR WH8NdRTG/SExwZqWGiya+wIvORsAqMZTmgjAqoAJsX5MbK9vzuOqQQv0VVxCerr/ r+l9mtOGluzLr5hMB4/1rpvAdd1VH5xlqtu9UArTJWANFStMQCr70g/jMknghkhj aUjo8Qg6hunP6y7npWFQmv/TR6fEF9BNETHIeGDVvUh5SvwtEIzg6PjbEU3poRKK h64fRdqdSe0UEuiC6fiaMWE+ryke3Mf2lPTJUsjrnOerwS4QCctL0MHsuuEtmJlv OVlfRWWAWJHcf9/oykGIpwmxgTbeLqoAn9fOZVab4o3yHkeELJlTHX3pK7F7jxzw 1Y1yk8fxxE5cx/7BHkQsDOubzZyrr5gt3uh66YbtYuwO5Envh7GxhzLBvzQJn+MD QjGkA6b7zn4g/+g5jnO2 =YiHt -----END PGP SIGNATURE-----

3 4

Re: [B.A.T.M.A.N.] alfred - one gateway - multiple interfaces
by Treasach＠web.de 24 Jul '14

24 Jul '14

Did you try to contact the author of this init-script/deb-file? Because this Maximilian Wilhelm is not the maintainer of this package in Debian https://qa.debian.org/developer.php?login=max@rfc2324.org nor an alfred/batman developer. https://qa.debian.org/developer.php?login=max@rfc2324.org[https://qa.debian… http://git.open-mesh.org/alfred.git/search?s=Maximilian+Wilhelm;st=author http://git.open-mesh.org/batman-adv.git/search?s=Maximilian+Wilhelm;st=auth… http://git.open-mesh.org/batctl.git/search?s=Maximilian+Wilhelm;st=author Gesendet: Mittwoch, 23. Juli 2014 um 21:23 Uhr Von: "Tobias Hachmer" <tobias-MiV4+CnmVYKELgA04lAiVw(a)public.gmane.org> An: b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r(a)public.gmane.org Betreff: alfred - one gateway - multiple interfaces -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hello list, running here 3 gateways serving two communities. Nearly everything is duplicated/separated logically: fastd, bridges, routing tables, batman domains, etc. Operating System is currently Ubuntu 14.04. alfred: Installed: 2014.1.0-1 Candidate: 2014.1.0-1 Version table: *** 2014.1.0-1 0 500 http://apt.rfc2324.org/debian/[http://apt.rfc2324.org/debian/] wheezy/main amd64 Packages 100 /var/lib/dpkg/status Guess what: We have the requirement to run one alfred instance for each batman domain. What is the suggested way to achieve this? For instance, I assume that this isn't intended by design because /etc/default/alfred in conjunction with the init script aren't multiple interface aware. - From our POV the preferred solution for this would be to patch the init script in order to support multiple interfaces by reading this from /etc/default/alfred, like: INTERFACES="bridge_one bridge_two" BATMANIFS="bat_one bat_two" Just to fork multiple separated processes. Maybe this is solved elsewhere and we didn't get it, yet. Please give us your thoughts and hopefully a solution to this issue. Regards, Tobias Hachmer -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/[http://www.enigmail.net/][http://www.enigmail.net/… iQIcBAEBCgAGBQJT0AuvAAoJEHXGlTiIv2V4QPUP/13h9qrMX79NMUBbIDnLGt41 b1tViUzs1v8zGeYfshgER4cTNk1j7B1iikjCchojxwhGdZpXh5CuWaTzJnbSVBjA 5SxSKsRdhVetp3EBErhezhv4jW1E7QlzjIQ9BW/kBV7bxyMxvaYhn6sfTlviCH2h WTYNxtU0ACxVJ63h8c720qneTkiS8O+SGLUHSxy7v8BuCRRTJtiMBYJf3zv7jJ2D 0Zskla7ASW9leWkMgescjcYL4c2m3N+BR1m01tML5C3En49NVddAEawwcoU/RTmR WH8NdRTG/SExwZqWGiya+wIvORsAqMZTmgjAqoAJsX5MbK9vzuOqQQv0VVxCerr/ r+l9mtOGluzLr5hMB4/1rpvAdd1VH5xlqtu9UArTJWANFStMQCr70g/jMknghkhj aUjo8Qg6hunP6y7npWFQmv/TR6fEF9BNETHIeGDVvUh5SvwtEIzg6PjbEU3poRKK h64fRdqdSe0UEuiC6fiaMWE+ryke3Mf2lPTJUsjrnOerwS4QCctL0MHsuuEtmJlv OVlfRWWAWJHcf9/oykGIpwmxgTbeLqoAn9fOZVab4o3yHkeELJlTHX3pK7F7jxzw 1Y1yk8fxxE5cx/7BHkQsDOubzZyrr5gt3uh66YbtYuwO5Envh7GxhzLBvzQJn+MD QjGkA6b7zn4g/+g5jnO2 =YiHt -----END PGP SIGNATURE-----

1 0

[B.A.T.M.A.N.] Batman-adv support for LXC containers
by Rahul Amin 22 Jul '14

22 Jul '14

Hi, I am trying to set up an emulation scenario with 2 nodes that uses Layer 2 routing via batman-adv. The emulation creates LXC containers for the 2 nodes and I need to assign wlan interfaces on each node to the bat0 interface. Following are the two things I tried: Approach 1: -> Set up wlanX interfaces on the host machine -> Assign bat0 as the mesh_iface on wlanX interfaces -> Move wlanX interfaces to LXC containers using 'ip link set wlanX netns namespace_id' command Problem with this approach is that I can't move bat0 interface from host machine to both containers. Approach 2: -> Set up wlanX interfaces on the host machine -> Assign bat1 mesh_iface for wlan1 and bat2 mesh_iface for wlan2 -> Move wlan1 and bat1 interface to LXC container 1 -> Move wlan2 and bat2 interface to LXC container 2 With this setup, I got node 1 (container 1) to ping to node 2 (container 2). But when I took wlan1 interface down and then brought it back up, I could not ping node 2 from node 1. I think both wlan1 and wlan2 need to be on the same mesh cloud (bat0 for example) instead of being on separate clouds (bat1 and bat2 in my setup). Correct me if I am wrong here please. I came across this thread that was created in March that talked about using batman-adv in LXC containers: http://comments.gmane.org/gmane.org.freifunk.batman/11684. They tried to do something similar as the two things I tried above. I was wondering if anyone was able to successfully use batman-adv in LXC containers. If so, please let me know the setup that worked for you. Otherwise, I will probably have to look at the source code next. Thanks, Rahul Amin -- MIT Lincoln Laboratory Airborne Networks Group

1 0

[B.A.T.M.A.N.] pull request [net]: batman-adv 20140721
by Antonio Quartulli 22 Jul '14

22 Jul '14

Hello David, here you have two fixes that we have been testing for quite some time (this is why they arrived a bit late in the rc cycle). Patch 1) ensures that BLA packets get dropped and not forwarded to the mesh even if they reach batman-adv within QinQ frames. Forwarding them into the mesh means messing up with the TT database of other nodes which can generate all kind of unexpected behaviours during route computation. Patch 2) avoids a couple of race conditions triggered upon fast VLAN deletion-addition. Such race conditions are pretty dangerous because they not only create inconsistencies in the TT database of the nodes in the network, but such scenario is also unrecoverable (unless nodes are rebooted). Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 640d7efe4c08f06c4ae5d31b79bd8740e7f6790a: dns_resolver: Null-terminate the right string (2014-07-20 22:33:32 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 35df3b298fc8779f7edf4b0228c683f7e98edcd5: batman-adv: fix TT VLAN inconsistency on VLAN re-add (2014-07-21 09:49:30 +0200) ---------------------------------------------------------------- Included fixes: - recognise and drop Bridge Loop Avoidance packets even if they are encapsulated in the 802.1q header multiple times. Forwarding them into the mesh creates issues on other nodes. - properly handle VLAN private objects in order to avoid race conditions upon fast VLAN deletion-addition. Such conditions create an unrecoverable inconsistency in the TT database of the nodes. ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: fix TT VLAN inconsistency on VLAN re-add Simon Wunderlich (1): batman-adv: drop QinQ claim frames in bridge loop avoidance net/batman-adv/bridge_loop_avoidance.c | 44 +++++++++++++++++++------ net/batman-adv/soft-interface.c | 60 ++++++++++++++++++++++++++-------- net/batman-adv/translation-table.c | 26 +++++++++++++++ net/batman-adv/types.h | 2 ++ 4 files changed, 108 insertions(+), 24 deletions(-)

2 3

[B.A.T.M.A.N.] [PATCH 1/2] batctl: adding multicast debug level
by Linus Lüssing 19 Jul '14

19 Jul '14

This patch adds the multicast debug level to check for own multicast flag changes for instance. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- README | 1 + sys.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/README b/README index b5fd259..c5e3575 100644 --- a/README +++ b/README @@ -389,6 +389,7 @@ $ batctl loglevel [ ] messages related to bridge loop avoidance (bla) [ ] messages related to arp snooping and distributed arp table (dat) [ ] messages related to network coding (nc) +[ ] messages related to multicast (mcast) batctl nc_nodes =============== diff --git a/sys.c b/sys.c index 676bef1..4fa0e24 100644 --- a/sys.c +++ b/sys.c @@ -280,6 +280,7 @@ static void log_level_usage(void) fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n"); fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n"); fprintf(stderr, " \t nc Messages related to network coding\n"); + fprintf(stderr, " \t mcast Messages related to multicast\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -325,6 +326,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= BIT(4); else if (strcmp(argv[i], "nc") == 0) log_level |= BIT(5); + else if (strcmp(argv[i], "mcast") == 0) + log_level |= BIT(6); else { log_level_usage(); goto out; @@ -359,6 +362,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to arp snooping and distributed arp table", "dat"); printf("[%c] %s (%s)\n", (log_level & BIT(5)) ? 'x' : ' ', "messages related to network coding", "nc"); + printf("[%c] %s (%s)\n", (log_level & BIT(6)) ? 'x' : ' ', + "messages related to multicast", "mcast"); out: free(path_buff); -- 1.7.10.4

2 3

[B.A.T.M.A.N.] [PATCHv2] batctl: tcpdump - parse TVLV containers
by Antonio Quartulli 19 Jul '14

19 Jul '14

From: Antonio Quartulli <antonio(a)open-mesh.com> OGMs and unicast TVLV packets carry TVLV containers as payload. With this patch such containers are now parsed and the relevant information is printed to screen. Moreover, the parts of code that have been touched by this patch have also been re-arranged a bit from the style point of view. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- changes since v1: - remove all the style changes - make tvlv_len of type ssize_t in dump_batman_iv_ogm() main.h | 7 +++ tcpdump.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- tcpdump.h | 1 + 3 files changed, 173 insertions(+), 5 deletions(-) diff --git a/main.h b/main.h index 2557c56..dbf7912 100644 --- a/main.h +++ b/main.h @@ -49,4 +49,11 @@ extern char module_ver_path[]; +#ifndef VLAN_VID_MASK +#define VLAN_VID_MASK 0xfff +#endif + +#define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ + (int)(vid & VLAN_VID_MASK) : -1) + #endif diff --git a/tcpdump.c b/tcpdump.c index e84617e..59b46d6 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -62,8 +62,7 @@ if ((size_t)(buff_len) < (check_len)) { \ return; \ } -static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | - DUMP_TYPE_BATBCAST | DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; +static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | DUMP_TYPE_BATBCAST | DUMP_TYPE_BATUTVLV | DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; static unsigned short dump_level; static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed); @@ -83,6 +82,7 @@ static void tcpdump_usage(void) fprintf(stderr, " \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); fprintf(stderr, " \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); fprintf(stderr, " \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); + fprintf(stderr, " \t\t%3d - batman unicast tvlv packets\n", DUMP_TYPE_BATUTVLV); fprintf(stderr, " \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } @@ -99,6 +99,138 @@ static int print_time(void) return 1; } +static void batctl_tvlv_parse_gw_v1(void *buff, + ssize_t (buff_len)__attribute__((unused))) +{ + struct batadv_tvlv_gateway_data *tvlv = buff; + uint32_t down, up; + + down = ntohl(tvlv->bandwidth_down); + up = ntohl(tvlv->bandwidth_up); + + printf("\tTVLV GWv1: down %d.%.1dMbps, up %d.%1dMbps\n", + down / 10, down % 10, up / 10, up % 10); +} + +static void batctl_tvlv_parse_dat_v1(void (*buff)__attribute__((unused)), + ssize_t (buff_len)__attribute__((unused))) +{ + printf("\tTVLV DATv1: enabled\n"); +} + +static void batctl_tvlv_parse_nc_v1(void (*buff)__attribute__((unused)), + ssize_t (buff_len)__attribute__((unused))) +{ + printf("\tTVLV NCv1: enabled\n"); +} + +static void batctl_tvlv_parse_tt_v1(void *buff, + ssize_t (buff_len)__attribute__((unused))) +{ + struct batadv_tvlv_tt_data *tvlv = buff; + struct batadv_tvlv_tt_vlan_data *vlan; + int i, num_vlan, num_entry; + const char *type; + + if (tvlv->flags & BATADV_TT_OGM_DIFF) + type = "OGM DIFF"; + else if (tvlv->flags & BATADV_TT_REQUEST) + type = "TT REQUEST"; + else if (tvlv->flags & BATADV_TT_RESPONSE) + type = "TT RESPONSE"; + else + type = "UNKNOWN"; + + num_vlan = ntohs(tvlv->num_vlan); + buff_len -= sizeof(*tvlv) + sizeof(*vlan) * num_vlan; + num_entry = buff_len / sizeof(struct batadv_tvlv_tt_change); + + printf("\tTVLV TTv1: %s [%c] ttvn=%hhu vlan_num=%hu entry_num=%hu\n", + type, tvlv->flags & BATADV_TT_FULL_TABLE ? 'F' : '.', + tvlv->ttvn, num_vlan, num_entry); + + vlan = (struct batadv_tvlv_tt_vlan_data *)(tvlv + 1); + for (i = 0; i < num_vlan; i++) { + printf("\t\tVLAN ID %hd, crc %#.8x\n", + BATADV_PRINT_VID(ntohs(vlan->vid)), + ntohl(vlan->crc)); + vlan++; + } +} + +static void batctl_tvlv_parse_roam_v1(void *buff, + ssize_t (buff_len)__attribute__((unused))) +{ + struct batadv_tvlv_roam_adv *tvlv = buff; + + printf("\tTVLV ROAMv1: client %s, VLAN ID %d\n", + get_name_by_macaddr((struct ether_addr *)tvlv->client, NO_FLAGS), + BATADV_PRINT_VID(ntohs(tvlv->vid))); +} + +typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len); + +/* location [i][j] contains the parsing function for TVLV of type 'i' and + * version 'j + 1' + */ +batctl_tvlv_parser_t tvlv_parsers[][1] = { + [BATADV_TVLV_GW][0] = batctl_tvlv_parse_gw_v1, + [BATADV_TVLV_DAT][0] = batctl_tvlv_parse_dat_v1, + [BATADV_TVLV_NC][0] = batctl_tvlv_parse_nc_v1, + [BATADV_TVLV_TT][0] = batctl_tvlv_parse_tt_v1, + [BATADV_TVLV_ROAM][0] = batctl_tvlv_parse_roam_v1, +}; + +static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, + int read_opt, int time_printed) +{ + struct batadv_unicast_tvlv_packet *tvlv_packet; + struct batadv_tvlv_hdr *tvlv_hdr; + struct ether_header *ether_header; + struct ether_addr *src, *dst; + batctl_tvlv_parser_t parser; + ssize_t check_len, tvlv_len, len; + uint8_t *ptr; + + check_len = (size_t)buff_len - sizeof(struct ether_header); + + LEN_CHECK(check_len, sizeof(*tvlv_packet), "BAT TVLV"); + check_len -= sizeof(*tvlv_packet); + + ether_header = (struct ether_header *)packet_buff; + tvlv_packet = (struct batadv_unicast_tvlv_packet *)(ether_header + 1); + + LEN_CHECK(check_len, (size_t)ntohs(tvlv_packet->tvlv_len), + "BAT TVLV (containers)"); + + if (!time_printed) + time_printed = print_time(); + + src = (struct ether_addr *)tvlv_packet->src; + printf("BAT %s > ", get_name_by_macaddr(src, read_opt)); + + dst = (struct ether_addr *)tvlv_packet->dst; + tvlv_len = ntohs(tvlv_packet->tvlv_len); + printf("%s: TVLV, len %zu, tvlv_len %zu, ttl %hhu\n", + get_name_by_macaddr(dst, read_opt), + buff_len - sizeof(struct ether_header), tvlv_len, + tvlv_packet->ttl); + + ptr = (uint8_t *)(tvlv_packet + 1); + + while (tvlv_len > 0) { + tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; + len = ntohs(tvlv_hdr->len); + + parser = tvlv_parsers[tvlv_hdr->type][tvlv_hdr->version - 1]; + parser(tvlv_hdr + 1, len); + + /* go to the next container */ + ptr = (uint8_t *)(tvlv_hdr + 1) + len; + tvlv_len -= sizeof(*tvlv_hdr) + len; + } +} + static int dump_bla2_claim(struct ether_header *eth_hdr, struct ether_arp *arphdr, int read_opt) { @@ -482,8 +614,13 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int { struct ether_header *ether_header; struct batadv_ogm_packet *batman_ogm_packet; + struct batadv_tvlv_hdr *tvlv_hdr; + ssize_t tvlv_len, len, check_len; + batctl_tvlv_parser_t parser; + uint8_t *ptr; - LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batadv_ogm_packet), "BAT IV OGM"); + check_len = (size_t)buff_len - sizeof(struct ether_header); + LEN_CHECK(check_len, sizeof(struct batadv_ogm_packet), "BAT IV OGM"); ether_header = (struct ether_header *)packet_buff; batman_ogm_packet = (struct batadv_ogm_packet *)(packet_buff + sizeof(struct ether_header)); @@ -494,14 +631,32 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); - printf("OGM IV via neigh %s, seq %u, tq %3d, ttl %2d, v %d, flags [%c%c%c], length %zu\n", + tvlv_len = ntohs(batman_ogm_packet->tvlv_len); + printf("OGM IV via neigh %s, seq %u, tq %3d, ttl %2d, v %d, flags [%c%c%c], length %zu, tvlv_len %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, batman_ogm_packet->ttl, batman_ogm_packet->version, (batman_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP ? 'N' : '.'), (batman_ogm_packet->flags & BATADV_DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP ? 'F' : '.'), - (size_t)buff_len - sizeof(struct ether_header)); + check_len, tvlv_len); + + check_len -= sizeof(struct batadv_ogm_packet); + LEN_CHECK(check_len, tvlv_len, "BAT OGM TVLV (containers)"); + + ptr = (uint8_t *)(batman_ogm_packet + 1); + + while (tvlv_len > 0) { + tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; + len = ntohs(tvlv_hdr->len); + + parser = tvlv_parsers[tvlv_hdr->type][tvlv_hdr->version - 1]; + parser(tvlv_hdr + 1, len); + + /* go to the next container */ + ptr = (uint8_t *)(tvlv_hdr + 1) + len; + tvlv_len -= sizeof(*tvlv_hdr) + len; + } } static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) @@ -683,6 +838,11 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read case BATADV_UNICAST_4ADDR: if (dump_level & DUMP_TYPE_BATUCAST) dump_batman_4addr(packet_buff, buff_len, read_opt, time_printed); + case BATADV_UNICAST_TVLV: + if ((dump_level & DUMP_TYPE_BATUCAST) || + (dump_level & DUMP_TYPE_BATUTVLV)) + dump_batman_ucast_tvlv(packet_buff, buff_len, + read_opt, time_printed); break; default: fprintf(stderr, "Warning - packet contains unknown batman packet type: 0x%02x\n", batman_ogm_packet->packet_type); diff --git a/tcpdump.h b/tcpdump.h index cfb1c69..5d936f2 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -41,6 +41,7 @@ #define DUMP_TYPE_BATICMP 2 #define DUMP_TYPE_BATUCAST 4 #define DUMP_TYPE_BATBCAST 8 +#define DUMP_TYPE_BATUTVLV 16 #define DUMP_TYPE_BATFRAG 32 #define DUMP_TYPE_NONBAT 128 -- 1.8.5.5

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N July 2014