commits January 2014

commits@lists.open-mesh.org

1 participants
96 discussions

[batctl] master: Merge branch 'next' (fe6eab5)
by postmaster＠open-mesh.org 06 Jan '14

06 Jan '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit fe6eab5219f7fafaa679423873a0e9df15c2c37d Merge: f168d47 3387207 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jan 6 16:45:32 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- fe6eab5219f7fafaa679423873a0e9df15c2c37d functions.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- functions.h | 1 + main.c | 2 +- man/batctl.8 | 12 ++-- sys.c | 15 ++++- sys.h | 22 +++--- 6 files changed, 227 insertions(+), 35 deletions(-)

1 0

[batctl] master's head updated: Merge branch 'next' (fe6eab5)
by postmaster＠open-mesh.org 06 Jan '14

06 Jan '14

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 148ba1c batctl: introduce rtnl_open() helper function d29288f batctl: implement vlan-to-link helper functions 03eaa85 batctl: add sys framework for VLAN support 3387207 batctl: remove gateway class left-overs in the manpage fe6eab5 Merge branch 'next'

1 0

[batctl] next: batctl: remove gateway class left-overs in the manpage (3387207)
by postmaster＠open-mesh.org 06 Jan '14

06 Jan '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 3387207008792d65935012acc2a17ec76a1a9d96 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jan 6 16:36:54 2014 +0800 batctl: remove gateway class left-overs in the manpage Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 3387207008792d65935012acc2a17ec76a1a9d96 man/batctl.8 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/man/batctl.8 b/man/batctl.8 index b3b12bd..2fe5941 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -107,15 +107,15 @@ If no parameter is given the current gateway mode is displayed otherwise the par second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if 'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv -module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload +module will propagate the entered value in the mesh. Use "/" to separate the down\(hy and upload rates. You can omit the upload rate and the module will assume an upload of download / 5. .RS 17 -default: 2000 \-> gateway class 20 +default: 10000 \-> 10.0/2.0 MBit .RE .RS 16 -examples: 5000 \-> gateway class 49 +examples: 5000 \-> 5.0/1.0 MBit .RE -.RS 25 +.RS 26 5000kbit 5mbit 5mbit/1024

1 0

[batctl] next: batctl: add sys framework for VLAN support (03eaa85)
by postmaster＠open-mesh.org 06 Jan '14

06 Jan '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 03eaa85be166b6c3fec526b58f27f8fa4c051298 Author: Marco Dalla Torre <marco.dallato(a)gmail.com> Date: Sun Jan 5 23:25:36 2014 +0100 batctl: add sys framework for VLAN support Allow the batctl tool to take advantage of changes from commit e4ff5c153dab054a6cd1c4132f87bc5e77127456 "add sys framework for VLAN" recently added to batman-adv, so that users can execute commands in a per VLAN fashion. If no directory entry corresponding to the user-selected device is found at the standard location for non VLAN interfaces (/sys/class/net/${device}/mesh/), 'batctl' now looks into directory: /sys/class/net/${base_device}/mesh/vlan${vid} Information on VLAN devices (base device, vid) necessary to construct the directory path is acquired by querying the netlink kernel module. Where: -${base_device}: the batman device on top of which the VLAN is sitting -${device}: the device interface for the VLAN, -${vid}: the identifier assigned to the VLAN. If the user-selected command is not supported by the VLAN, an appropriate error is shown. Signed-off-by: Marco Dalla Torre <marco.dallato(a)gmail.com> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 03eaa85be166b6c3fec526b58f27f8fa4c051298 main.c | 2 +- man/batctl.8 | 4 ++-- sys.c | 15 +++++++++++++-- sys.h | 22 ++++++++++++---------- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/main.c b/main.c index aab2e11..a37c0b7 100644 --- a/main.c +++ b/main.c @@ -46,7 +46,7 @@ static void print_usage(void) fprintf(stderr, "Usage: batctl [options] command|debug table [parameters]\n"); fprintf(stderr, "options:\n"); - fprintf(stderr, " \t-m mesh interface (default 'bat0')\n"); + fprintf(stderr, " \t-m mesh interface or VLAN created on top of a mesh interface (default 'bat0')\n"); fprintf(stderr, " \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); fprintf(stderr, " \t-v print version\n"); fprintf(stderr, "\n"); diff --git a/man/batctl.8 b/man/batctl.8 index fafe735..b3b12bd 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -42,7 +42,7 @@ behaviour or using the B.A.T.M.A.N. advanced protocol. .SH OPTIONS .TP .I \fBoptions: -\-m specify mesh interface (default 'bat0') +\-m specify mesh interface or VLAN created on top of a mesh interface (default 'bat0') .br \-h print general batctl help .br @@ -61,7 +61,7 @@ originator interval. The interval is in units of milliseconds. .br .IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or -disable ap isolation. +disable ap isolation. This command can be used in conjunction with "-m" option to target per VLAN configurations. .br .IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable diff --git a/sys.c b/sys.c index 2a508e2..5cebf52 100644 --- a/sys.c +++ b/sys.c @@ -372,8 +372,8 @@ static void settings_usage(int setting) int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) { - int optchar, res = EXIT_FAILURE; - char *path_buff; + int vid, optchar, res = EXIT_FAILURE; + char *path_buff, *base_dev = NULL; const char **ptr; while ((optchar = getopt(argc, argv, "h")) != -1) { @@ -387,10 +387,20 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) } } + /* prepare the classic path */ path_buff = malloc(PATH_BUFF_LEN); snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); path_buff[PATH_BUFF_LEN - 1] = '\0'; + /* if the specified interface is a VLAN then change the path to point + * to the proper "vlan%{vid}" subfolder in the sysfs tree. + */ + vid = vlan_get_link(mesh_iface, &base_dev); + if (vid >= 0) { + snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, base_dev, vid); + path_buff[PATH_BUFF_LEN - 1] = '\0'; + } + if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, NO_FLAGS, 0, 0, 0); @@ -425,6 +435,7 @@ write_file: out: free(path_buff); + free(base_dev); return res; } diff --git a/sys.h b/sys.h index 8934978..2cbbcfb 100644 --- a/sys.h +++ b/sys.h @@ -24,16 +24,18 @@ #include "main.h" -#define SYS_BATIF_PATH_FMT "/sys/class/net/%s/mesh/" -#define SYS_LOG_LEVEL "log_level" -#define SYS_LOG "log" -#define SYS_GW_MODE "gw_mode" -#define SYS_GW_SEL "gw_sel_class" -#define SYS_GW_BW "gw_bandwidth" -#define SYS_IFACE_PATH "/sys/class/net" -#define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" -#define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" -#define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" +#define SYS_BATIF_PATH_FMT "/sys/class/net/%s/mesh/" +#define SYS_LOG_LEVEL "log_level" +#define SYS_LOG "log" +#define SYS_GW_MODE "gw_mode" +#define SYS_GW_SEL "gw_sel_class" +#define SYS_GW_BW "gw_bandwidth" +#define SYS_IFACE_PATH "/sys/class/net" +#define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" +#define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" +#define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" +#define SYS_VLAN_PATH SYS_IFACE_PATH"/%s/mesh/vlan%d/" +#define VLAN_ID_MAX_LEN 4 enum batctl_settings_list { BATCTL_SETTINGS_ORIG_INTERVAL,

1 0

[batctl] next: batctl: implement vlan-to-link helper functions (d29288f)
by postmaster＠open-mesh.org 06 Jan '14

06 Jan '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit d29288fe05834721b9f3914b1c2aee1e8938c5e9 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun Jan 5 23:25:35 2014 +0100 batctl: implement vlan-to-link helper functions This functions can be used to convert a vlan interface into the real one and to extract the vlan identifier. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d29288fe05834721b9f3914b1c2aee1e8938c5e9 functions.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ functions.h | 1 + 2 files changed, 160 insertions(+) diff --git a/functions.c b/functions.c index 33ca9ff..8894df4 100644 --- a/functions.c +++ b/functions.c @@ -40,6 +40,7 @@ #include <linux/neighbour.h> #include <sys/uio.h> #include <errno.h> +#include <net/if.h> #include "main.h" #include "functions.h" @@ -770,3 +771,161 @@ struct ether_addr *resolve_mac(const char *asc) out: return mac_result; } + +/** + * vlan_get_link_parse - parse a get_link rtnl message and extract the important + * data + * @nh: the reply header + * @iface: pointer to the buffer where the link interface has to be stored (it + * is allocated by this function) + * + * Return the vid in case of success or -1 otherwise + */ +static int vlan_get_link_parse(struct nlmsghdr *nh, char **iface) +{ + struct ifinfomsg *ifi = NLMSG_DATA(nh); + size_t vlan_len, info_len, len = nh->nlmsg_len; + struct rtattr *rta, *info, *vlan; + int idx = -1, vid = -1; + + *iface = NULL; + + rta = IFLA_RTA(ifi); + while (RTA_OK(rta, len)) { + /* check if the interface is a vlan */ + if (rta->rta_type == IFLA_LINKINFO) { + info = RTA_DATA(rta); + info_len = RTA_PAYLOAD(rta); + + while (RTA_OK(info, info_len)) { + if (info->rta_type == IFLA_INFO_KIND && + strcmp(RTA_DATA(info), "vlan")) + goto err; + + if (info->rta_type == IFLA_INFO_DATA) { + vlan = RTA_DATA(info); + vlan_len = RTA_PAYLOAD(info); + + while (RTA_OK(vlan, vlan_len)) { + if (vlan->rta_type == IFLA_VLAN_ID) + vid = *(int *)RTA_DATA(vlan); + vlan = RTA_NEXT(vlan, vlan_len); + } + } + info = RTA_NEXT(info, info_len); + } + } + + /* extract the name of the "link" interface */ + if (rta->rta_type == IFLA_LINK) { + idx = *(int *)RTA_DATA(rta); + + *iface = malloc(IFNAMSIZ + 1); + if (!if_indextoname(idx, *iface)) + goto err; + } + rta = RTA_NEXT(rta, len); + } + + if (vid == -1) + goto err; + + if (idx <= 0) + goto err; + + return vid; +err: + free(*iface); + return -1; +} + +/** + * vlan_get_link_dump - receive and dump a get_link rtnl reply + * @sock: the socket to listen for the reply on + * @buf: buffer where the reply has to be dumped to + * @buflen: length of the buffer + * + * Returns the amount of dumped bytes + */ +static ssize_t vlan_get_link_dump(int sock, void *buf, size_t buflen) +{ + struct sockaddr_nl nladdr; + struct msghdr msg; + struct iovec iov; + + memset(&msg, 0, sizeof(msg)); + memset(&iov, 0, sizeof(iov)); + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_controllen = 0; + msg.msg_control = NULL; + msg.msg_flags = 0; + msg.msg_name = &nladdr; + msg.msg_namelen = sizeof(nladdr); + + iov.iov_len = buflen; + iov.iov_base = buf; + + return recvmsg(sock, &msg, 0); +} + +/** + * vlan_get_link_open - send a get_link request + * @ifname: the interface to query + * + * Returns 0 in case of success or a negative error code otherwise + */ +static int vlan_get_link_open(const char *ifname) +{ + struct { + struct nlmsghdr hdr; + struct ifinfomsg ifi; + } nlreq; + + memset(&nlreq, 0, sizeof(nlreq)); + nlreq.hdr.nlmsg_len = NLMSG_LENGTH(sizeof(nlreq.ifi)); + nlreq.hdr.nlmsg_type = RTM_GETLINK; + nlreq.hdr.nlmsg_flags = NLM_F_REQUEST; + nlreq.ifi.ifi_family = AF_UNSPEC; + nlreq.ifi.ifi_index = if_nametoindex(ifname); + + return rtnl_open(&nlreq, 0); +} + +/** + * vlan_get_link - convert a VLAN interface into its parent one + * @ifname: the interface to convert + * @parent: buffer where the parent interface name will be written (allocated by + * this function) + * + * Returns the vlan identifier on success or -1 on error + */ +int vlan_get_link(const char *ifname, char **parent) +{ + int vid = -1, socknl; + void *buf = NULL; + size_t buflen; + ssize_t len; + + buflen = 8192; + buf = malloc(buflen); + if (!buf) + goto err; + + socknl = vlan_get_link_open(ifname); + if (socknl < 0) + goto err; + + len = vlan_get_link_dump(socknl, buf, buflen); + if (len < 0) + goto err_sock; + + vid = vlan_get_link_parse(buf, parent); + +err_sock: + close(socknl); +err: + free(buf); + return vid; +} diff --git a/functions.h b/functions.h index 522c607..14ba525 100644 --- a/functions.h +++ b/functions.h @@ -42,6 +42,7 @@ int write_file(const char *dir, const char *fname, const char *arg1, const char *arg2); struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); struct ether_addr *resolve_mac(const char *asc); +int vlan_get_link(const char *ifname, char **parent); extern char *line_ptr;

1 0

[batctl] next: batctl: introduce rtnl_open() helper function (148ba1c)
by postmaster＠open-mesh.org 06 Jan '14

06 Jan '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 148ba1c4b744ff0cda950926f6dfc4006faf44a5 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun Jan 5 23:25:34 2014 +0100 batctl: introduce rtnl_open() helper function Other part of batctl may require to open and send a message to RTNL. Extract this code and put it in a generic helper to simplify future uses. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 148ba1c4b744ff0cda950926f6dfc4006faf44a5 functions.c | 51 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/functions.c b/functions.c index 13ba190..33ca9ff 100644 --- a/functions.c +++ b/functions.c @@ -497,30 +497,28 @@ static void request_mac_resolve(int ai_family, const void *l3addr) close(sock); } -static int resolve_mac_from_cache_open(int ai_family) +/** + * rtnl_open - open a socket to rtnl and send a request + * @nh: the header of the request to send + * @protocol: the protocol to use when opening the socket + * + * Return 0 on success or a negative error code otherwise + */ +static int rtnl_open(void *req, int protocol) { - int socknl; - int ret; - struct { - struct nlmsghdr hdr; - struct ndmsg msg; - } nlreq; - struct sockaddr_nl addrnl; static uint32_t nr_call = 0; uint32_t pid = (++nr_call + getpid()) & 0x3FFFFF; + struct sockaddr_nl addrnl; + struct nlmsghdr *nh; + int socknl; + int ret; memset(&addrnl, 0, sizeof(addrnl)); addrnl.nl_family = AF_NETLINK; addrnl.nl_pid = pid; addrnl.nl_groups = 0; - memset(&nlreq, 0, sizeof(nlreq)); - nlreq.hdr.nlmsg_len = NLMSG_LENGTH(sizeof(nlreq.msg)); - nlreq.hdr.nlmsg_type = RTM_GETNEIGH; - nlreq.hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; - nlreq.msg.ndm_family = ai_family; - - socknl = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); + socknl = socket(AF_NETLINK, SOCK_RAW, protocol); if (socknl < 0) goto out; @@ -528,7 +526,12 @@ static int resolve_mac_from_cache_open(int ai_family) if (ret < 0) goto outclose; - ret = send(socknl, &nlreq, nlreq.hdr.nlmsg_len, 0); + /* the nlmsghdr object must always be the first member in the req + * structure + */ + nh = (struct nlmsghdr *)req; + + ret = send(socknl, nh, nh->nlmsg_len, 0); if (ret < 0) goto outclose; out: @@ -538,6 +541,22 @@ outclose: return ret; } +static int resolve_mac_from_cache_open(int ai_family) +{ + struct { + struct nlmsghdr hdr; + struct ndmsg msg; + } nlreq; + + memset(&nlreq, 0, sizeof(nlreq)); + nlreq.hdr.nlmsg_len = NLMSG_LENGTH(sizeof(nlreq.msg)); + nlreq.hdr.nlmsg_type = RTM_GETNEIGH; + nlreq.hdr.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; + nlreq.msg.ndm_family = ai_family; + + return rtnl_open(&nlreq, NETLINK_ROUTE); +} + static ssize_t resolve_mac_from_cache_dump(int sock, void **buf, size_t *buflen) { struct iovec iov;

1 0

[linux-merge]linux integration; annotated tag, v3.13-rc7, created. v3.13-rc7
by postmaster＠open-mesh.org 05 Jan '14

05 Jan '14

The annotated tag, v3.13-rc7 has been created at 66d8d623aca0b26934afe85f5b05eb930d0166d0 (tag) tagging d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (commit) replaces v3.13-rc6 tagged by Linus Torvalds on Sat Jan 4 15:12:27 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.13-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJSyJVbAAoJEHm+PkMAQRiGa28H/0m7GpZSpT8mvBthITxzqWCq JRkSPS4KTurAWlA5CJMJePyCM30DgN90s06bYUen9sTecZUwnL+qSV5OqAmg2r+0 PrfwtXtGZR6/Y12XlZ/3oFxVfUxjmgJyDAS76TIH1IvIum52nvJmLrR+6AyVphIX DkgBOuapdA7lia+U+ZM1cRkeHxUOKTUEw9v611VgoN3LYZyzyRb6d0rB7JtZN1RV dnXRi27enaPhwxelsCnORioRjsByMwD40CERxfLHmr5CGhmvCehBjO6bJ+KAdp14 52bfwWcNdbFMzUobcR7qlfS3Hy3AYJci+P6JzeeZ+kWEdv/eh5/1lvNuXtBJRlc= =iwzJ -----END PGP SIGNATURE----- Antonio Quartulli (4): batman-adv: fix size of batadv_icmp_header batman-adv: fix alignment for batadv_tvlv_tt_change batman-adv: clean nf state when removing protocol header batman-adv: fix vlan header access Simon Wunderlich (3): batman-adv: fix alignment for batadv_coded_packet batman-adv: fix header alignment by unrolling batadv_header batman-adv: fix size of batadv_bla_claim_dst ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-batman-adv] master: batman-adv-devel: update to latest master and add unstripping macro (3f047c1)
by postmaster＠open-mesh.org 05 Jan '14

05 Jan '14

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit 3f047c1c395d6d77eab82deb5dce8a0d11b51a28 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Jan 6 05:26:48 2014 +0800 batman-adv-devel: update to latest master and add unstripping macro Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 3f047c1c395d6d77eab82deb5dce8a0d11b51a28 batman-adv-devel/Config.in | 4 ++-- batman-adv-devel/Makefile | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 10d5551..fc8f917 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -32,7 +32,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_REV string prompt "batman-adv git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "90725dd" + default "8eb830f" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches @@ -42,7 +42,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATCTL_REV string prompt "batctl git revision to build package with" depends on PACKAGE_kmod-batman-adv-devel - default "fc04a78" + default "f168d47" help Enter the full or shortened git revision to override package default value. This allows to build from non-master branches diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 12749be..5d478bc 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -117,6 +117,12 @@ define Build/Patch $(BATCTL_PATCH) endef +define Build/Prepare + $(call Build/Prepare/Default) + $(SED) '/#define _NET_BATMAN_ADV_MAIN_H_/a\#undef CONFIG_MODULE_STRIPPED' \ + $(PKG_BUILD_DIR)/main.h +endef + define Build/Compile $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATMAN_ADV_ARGS) $(BATCTL_BUILD)

1 0

[batman-adv] master's head updated: Merge branch 'next' (8eb830f)
by postmaster＠open-mesh.org 05 Jan '14

05 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 77c2a6c batman-adv: use batadv_compare_eth for concise 8eb830f Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (8eb830f)
by postmaster＠open-mesh.org 05 Jan '14

05 Jan '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8eb830fa19d3c61ec2d305c68b2724b865611167 Merge: 7540bb8 77c2a6c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jan 5 19:19:35 2014 +0800 Merge branch 'next' Conflicts: originator.c translation-table.c >--------------------------------------------------------------- 8eb830fa19d3c61ec2d305c68b2724b865611167 originator.c | 2 +- translation-table.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

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 January 2014