commits October 2013

commits@lists.open-mesh.org

1 participants
109 discussions

[batman-adv] next's head updated: Merge branch 'maint' into next (4338760)
by postmaster＠open-mesh.org 09 Oct '13

09 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 227df84 batman-adv: fix compat of net_ratelimited_function for >3.2.46 4338760 Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: fix compat of net_ratelimited_function for >3.2.46 (227df84)
by postmaster＠open-mesh.org 09 Oct '13

09 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 227df84f96206b2b26cecdc3d5d75d0ab675f577 Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Thu Oct 3 23:02:13 2013 +0200 batman-adv: fix compat of net_ratelimited_function for >3.2.46 Appearently net_ratelimited_function was added to the stable series of from 3.2.47, which results in a lot of warnings when compiling against this kernel. This patch avoids this redefinition. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 227df84f96206b2b26cecdc3d5d75d0ab675f577 compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h index 35ed4d9..3e11f89 100644 --- a/compat.h +++ b/compat.h @@ -210,11 +210,13 @@ static inline void batadv_eth_hw_addr_random(struct net_device *dev) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) +#ifndef net_ratelimited_function #define net_ratelimited_function(func, ...) \ do { \ if (net_ratelimit()) \ func(__VA_ARGS__); \ } while (0) +#endif /* ifndef net_ratelimited_function */ #endif /* < KERNEL_VERSION(3, 5, 0) */

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem
by postmaster＠open-mesh.org 09 Oct '13

09 Oct '13

The annotated tag, batman-adv-for-davem has been updated to ee2bbac6767eaa81f2537fe36e85d39196296a5e (tag) from eb18d15d9519e1d5460626d3f539efd1a1dc20d1 (which is now obsolete) tagging e913fd1945f0b5403c58881c36e90d90820bef3c (commit) replaces batman-adv-fix-for-davem tagged by Antonio Quartulli on Wed Oct 9 08:49:12 2013 +0200 - Shortlog ------------------------------------------------------------ Included changes: - update emails for A. Quartulli and M. Lindner in MAINTAINERS - switch to the next on-the-wire protocol version - introduce the T(ype) V(ersion) L(ength) V(alue) framework - adjust the existing components to make them use the new TVLV code - make the TT component use CRC32 instead of CRC16 - totally remove the VIS functionality (has been moved to userspace) - reorder packet types and flags - add static checks on packet format - remove __packed from batadv_ogm_packet -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJSVPxtAAoJEADl0hg6qKeOTQcP/i2iQEmOLnbgCCQJH7gRUmZv qOp2hCbOSQQI0AabuloA6kwHujbgfVSzzr5bu41Yb0qYu9d5cOJuEPLOJjM3VQcm bgvzqrCDtkMBMFXnUd6whJxD2Qm20ZeETkj70wMKye0aPaFPCw+evn4Ymx/1Yc/s WSdRGtvebcTFW2wPvMQx/dwrRch4L+PU0QoesSGnVmIQiiGM0rG+6zUWFf+4TR2S Wbdv/t5rshE7LqFu3NQEOGziICNiKMlQmLPFVgBxXlvEGkdnaOSuparUEMX398w7 NfjuJZUm4fQdQ1t3BsHQ8Sw0MvH32hJzn4dzvvuC8SBegKQiQKAVNoQqs3B91rjh J+pcf+umhsLFy7sN/8tDTbRAusCvgKrDyt/otFWwtiXYYkSmrJHNoLD5MC98IHZ5 kSB/sHuQlKiQDr+R2KzJtuvYblJt0jxqC7dRnNvs9AozWbattHzr2yChNxh4kj+1 my8d8XMQb/UE10r80F4MsWR2iBo0P5Mw2x6m4mUBA2VkNEo0+mgENm81QDuvEdE+ iTG7JuDBb1Q0J/WGtMJILdEHCZHyVsIbfhy0mtuyrL4mpWCKQEKHvWTIjL7OFyyp bv9ylOxBKlCiL2Q5RHzA6PKno55sWLb/LQMFuxdtiV8Mqpwy9hBCbzxbaQVuLa/C wUQaPF9MLC0LCEPeULR7 =LYjJ -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit Marek Lindner (7): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets Simon Wunderlich (5): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem
by postmaster＠open-mesh.org 09 Oct '13

09 Oct '13

The annotated tag, batman-adv-for-davem has been created at eb18d15d9519e1d5460626d3f539efd1a1dc20d1 (tag) tagging f67459b96fd434052636d36033dcd3a3ac78b94d (commit) replaces batman-adv-fix-for-davem tagged by Antonio Quartulli on Wed Oct 9 08:27:03 2013 +0200 - Shortlog ------------------------------------------------------------ Included changes: - update emails for A. Quartulli and M. Lindner in MAINTAINERS - switch to the next on-the-wire protocol version - introduce the T(ype) V(ersion) L(ength) V(alue) framework - adjust the existing components to make them use the new TVLV code - make the TT component use CRC32 instead of CRC16 - totally remove the VIS functionality (has been moved to userspace) - reorder packet types and flags - add static checks on packet format - remove __packed from batadv_ogm_packet -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJSVPgmAAoJEADl0hg6qKeO9yoP/j7xOM5cQN8eMQbl3s8ftX3X H91kAuqdbQvaUwt7SYC54b3F7Br/v1UT9cheia67eMbzjBy0P86ZKysihO/Y7WNn tKKW3xdcxiYgRuiDwq2kqXIHKTSzU2WjX4LFRekUAxn00uXcltIreXFblIxTIF0B ed+gheaA8ijMEvFI9XRcrn9DNS+XxrDu++ox6zDqunZADvamfuOPY8jXG8OLR+FJ 0sDHMAPF3y2uDS2EwlLa3c0pspF3Pzz5wbnj8PyRSswYv+0vwZuNGzR3Dl/T7B4u j0MeQ5FFMzD6B97lXevL0Afpz6Mjo87mvlKWdkB7RgzyAU+iu2rpzhS05lK20wSx DXFZgGfpJhS3ATobC8wDd4T7bjnUH3oRBO9qZZZxA/nFjZWl4uZqf0nVsN6i+jv/ XtCDoa+ToNCN7wxEYzBwZ4SajGQyrjSL/EZtjFixcn1O5oOH3TeWOWA6+jSjYm3N pjZp2qRSw/c8HkfH/BOv3uXGSNGSm2FVaqV4n/bt+Qp2kChz8oCVOlVFbMrsITCu 5KkhNfWR2I3tV6YKKR11Hxt9a4ATZWpRhUWUb8EltsdPPj7jWe017PHUutbh4MX3 ygyIgTLCghOunn/8e8La1ukcjjX0KTWj3PH9xefWXjk90g6howui0z5nK56rNP5F 7asdKca/FrPsp4e71sRn =4C0i -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit Marek Lindner (7): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets Simon Wunderlich (5): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, deleted. v3.12-rc1-312-gebf44cc
by postmaster＠open-mesh.org 09 Oct '13

09 Oct '13

The annotated tag, batman-adv-for-davem has been deleted was a865db68ba625dd0424987c0b056a0b20305968b ----------------------------------------------------------------------- tag batman-adv-for-davem Included changes: - email update in MAINTAINERS file - switch to the new compatibility version - introduce the TVLV (Type,Version,Length,Value) infrastructure to improve the compatibility layer and avoid futile breakage in the future - make the current features use the TVLV mechanism - make the Translation Table component use the more robust CRC32C instead of CRC16 - completely remove the VIS functionality (it has been substituted by a userspace application) - add static packet format checks to ensure nobody messes up the alignment - remove the __packed attribute from the batadv_ogm_packet structure - reorder some of the flags sent on the wire for a better layout -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSPx82AAoJEADl0hg6qKeOOPkP/jPJ/oFSMsE4SabePZEmuw3x WEZObeygRNZqOKCiQW5rlUDAq6c9Y48C7l2kO9fGrxWZTefCsaBEaZB8/X72OBCf 75oSlZlsEhS+T6sgdiVE0fNBjOgJIlni2Olb/LBNn7XRkpFlcGKdev3IXU/3PlKa gxcqsiU8uO5LueuP3pcLAH4H4ruUTqiAuatQZX3yd9pOvUK7/4jn3gln5q+PmuVi K8Mak7y/jKpqB6agKtaIBN5EWwhgBwCdu5fAnD+R/6yA7Bn8qdWGbGRtFHdk+heO Mx6GXAobDcHIjCrXk1tnUBBy2wA87Juuz0IOD4lrf33ut1fePbt8OG7sMCXM2MEq aDlU3vafOQAqeIK/SjSOvR03jpI2jiGWfYiYaHC5BbpOnItfIMOvTADiQBt1xO1Q vT+Ki7WPxE7zFGsYnZEVMVwBFrjmwIEENHLE0j9SmCveIw1+KZPXTVap8Thg9G7x ubxE73nxNkQ2NJLrzA9AmzFAO6MnSs9WkZ05UKwGS/mxO5lg6GoBU/EzKi8K7l+f 5uqvTC9XcDFWYvt5xeiEOJdWLNYU9SKXM0LsVaN4vt5aiQ0uUDDkaKfLWVkJ9e2n 1blTu3rowwEU0oof5DThIqmfKxDq1VmfrKYXhum2EUeF8E1O9c/GTxKdsnj1b7SQ DXkJAoGEriB6uyVKSUeu =UkNg -----END PGP SIGNATURE----- ebf44ccfdf42418b97bebfc1229ee5c66b0a895e batman-adv: reorder batadv_iv_flags ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.12-rc1-1938-g4df395c
by postmaster＠open-mesh.org 09 Oct '13

09 Oct '13

The following commit has been merged in the merge/master branch: commit 4df395ccec21b42b7acc7bfb21f5d56f7b6cf9eb Merge: 6da58e686fec14e87b3d235af493d29b4dff1d3d 17a6a8c33c602fd9b495f5878895449e62361b6f Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Tue Oct 8 08:23:50 2013 +0200 Merge remote-tracking branch 'pkg/next' into merge/master Conflicts: Documentation/accounting/gateway_common.c Documentation/accounting/gateway_common.h Documentation/accounting/hard-interface.c Documentation/accounting/main.c Documentation/accounting/network-coding.c Documentation/accounting/network-coding.h Documentation/accounting/translation-table.c Documentation/accounting/types.h diff --combined net/batman-adv/gateway_common.c index 07fd877,b211b0f..b211b0f --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@@ -34,9 -34,10 +34,10 @@@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, uint32_t *down, uint32_t *up) { - int ret, bw_unit_type = BATADV_BW_UNIT_KBIT; + enum batadv_bandwidth_units bw_unit_type = BATADV_BW_UNIT_KBIT; char *slash_ptr, *tmp_ptr; long ldown, lup; + int ret; slash_ptr = strchr(buff, '/'); if (slash_ptr) @@@ -223,15 -224,12 +224,12 @@@ static void batadv_gw_tvlv_ogm_handler_ /** * batadv_gw_init - initialise the gateway handling internals * @bat_priv: the bat priv with all the soft interface information - * - * Return 0 on success or negative error number in case of failure. */ - int batadv_gw_init(struct batadv_priv *bat_priv) + void batadv_gw_init(struct batadv_priv *bat_priv) { batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1, NULL, BATADV_TVLV_GW, 1, BATADV_TVLV_HANDLER_OGM_CIFNOTFND); - return 0; } /** diff --combined net/batman-adv/gateway_common.h index f18e8b7,56384a4..56384a4 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@@ -31,7 -31,7 +31,7 @@@ enum batadv_gw_modes * @BATADV_BW_UNIT_KBIT: unit type kbit * @BATADV_BW_UNIT_MBIT: unit type mbit */ - enum batadv_bandwidth_types { + enum batadv_bandwidth_units { BATADV_BW_UNIT_KBIT, BATADV_BW_UNIT_MBIT, }; @@@ -43,7 -43,7 +43,7 @@@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, size_t count); void batadv_gw_tvlv_container_update(struct batadv_priv *bat_priv); - int batadv_gw_init(struct batadv_priv *bat_priv); + void batadv_gw_init(struct batadv_priv *bat_priv); void batadv_gw_free(struct batadv_priv *bat_priv); #endif /* _NET_BATMAN_ADV_GATEWAY_COMMON_H_ */ diff --combined net/batman-adv/main.c index 5c5e64b,c51a5e5..c51a5e5 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@@ -66,6 -66,7 +66,7 @@@ static int __init batadv_init(void batadv_recv_handler_init(); batadv_iv_init(); + batadv_nc_init(); batadv_event_workqueue = create_singlethread_workqueue("bat_events"); @@@ -141,13 -142,11 +142,11 @@@ int batadv_mesh_init(struct net_device if (ret < 0) goto err; - ret = batadv_nc_init(bat_priv); + ret = batadv_nc_mesh_init(bat_priv); if (ret < 0) goto err; - ret = batadv_gw_init(bat_priv); - if (ret < 0) - goto err; + batadv_gw_init(bat_priv); atomic_set(&bat_priv->gw.reselect, 0); atomic_set(&bat_priv->mesh_state, BATADV_MESH_ACTIVE); @@@ -168,7 -167,7 +167,7 @@@ void batadv_mesh_free(struct net_devic batadv_purge_outstanding_packets(bat_priv, NULL); batadv_gw_node_purge(bat_priv); - batadv_nc_free(bat_priv); + batadv_nc_mesh_free(bat_priv); batadv_dat_free(bat_priv); batadv_bla_free(bat_priv); @@@ -1014,10 -1013,10 +1013,10 @@@ void batadv_tvlv_ogm_receive(struct bat * payload * @bat_priv: the bat priv with all the soft interface information * @optr: ogm tvlv handler callback function. This function receives the orig - * node, flags and the tvlv content as argument to process. - * uptr: unicast tvlv handler callback function. This function receives the - * source & destination of the unicast packet as well as the tvlv content - * to process. + * node, flags and the tvlv content as argument to process. + * @uptr: unicast tvlv handler callback function. This function receives the + * source & destination of the unicast packet as well as the tvlv content + * to process. * @type: tvlv handler type to be registered * @version: tvlv handler version to be registered * @flags: flags to enable or disable TVLV API behavior diff --combined net/batman-adv/network-coding.c index 173a96e,351e199..351e199 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@@ -35,6 -35,20 +35,20 @@@ static int batadv_nc_recv_coded_packet( struct batadv_hard_iface *recv_if); /** + * batadv_nc_init - one-time initialization for network coding + */ + int __init batadv_nc_init(void) + { + int ret; + + /* Register our packet type */ + ret = batadv_recv_handler_register(BATADV_CODED, + batadv_nc_recv_coded_packet); + + return ret; + } + + /** * batadv_nc_start_timer - initialise the nc periodic worker * @bat_priv: the bat priv with all the soft interface information */ @@@ -98,10 -112,10 +112,10 @@@ static void batadv_nc_tvlv_ogm_handler_ } /** - * batadv_nc_init - initialise coding hash table and start house keeping + * batadv_nc_mesh_init - initialise coding hash table and start house keeping * @bat_priv: the bat priv with all the soft interface information */ - int batadv_nc_init(struct batadv_priv *bat_priv) + int batadv_nc_mesh_init(struct batadv_priv *bat_priv) { bat_priv->nc.timestamp_fwd_flush = jiffies; bat_priv->nc.timestamp_sniffed_purge = jiffies; @@@ -123,11 -137,6 +137,6 @@@ batadv_hash_set_lock_class(bat_priv->nc.coding_hash, &batadv_nc_decoding_hash_lock_class_key); - /* Register our packet type */ - if (batadv_recv_handler_register(BATADV_CODED, - batadv_nc_recv_coded_packet) < 0) - goto err; - INIT_DELAYED_WORK(&bat_priv->nc.work, batadv_nc_worker); batadv_nc_start_timer(bat_priv); @@@ -1784,12 -1793,11 +1793,11 @@@ free_nc_packet } /** - * batadv_nc_free - clean up network coding memory + * batadv_nc_mesh_free - clean up network coding memory * @bat_priv: the bat priv with all the soft interface information */ - void batadv_nc_free(struct batadv_priv *bat_priv) + void batadv_nc_mesh_free(struct batadv_priv *bat_priv) { - batadv_recv_handler_unregister(BATADV_CODED); batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_NC, 1); batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_NC, 1); cancel_delayed_work_sync(&bat_priv->nc.work); diff --combined net/batman-adv/network-coding.h index 8a97b40,d4fd315..d4fd315 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h @@@ -23,8 -23,9 +23,9 @@@ #ifdef CONFIG_BATMAN_ADV_NC void batadv_nc_status_update(struct net_device *net_dev); - int batadv_nc_init(struct batadv_priv *bat_priv); - void batadv_nc_free(struct batadv_priv *bat_priv); + int batadv_nc_init(void); + int batadv_nc_mesh_init(struct batadv_priv *bat_priv); + void batadv_nc_mesh_free(struct batadv_priv *bat_priv); void batadv_nc_update_nc_node(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, struct batadv_orig_node *orig_neigh_node, @@@ -49,15 -50,19 +50,19 @@@ int batadv_nc_init_debugfs(struct batad static inline void batadv_nc_status_update(struct net_device *net_dev) { - return; } - static inline int batadv_nc_init(struct batadv_priv *bat_priv) + static inline int batadv_nc_init(void) + { + return 0; + } + + static inline int batadv_nc_mesh_init(struct batadv_priv *bat_priv) { return 0; } - static inline void batadv_nc_free(struct batadv_priv *bat_priv) + static inline void batadv_nc_mesh_free(struct batadv_priv *bat_priv) { return; } diff --combined net/batman-adv/translation-table.c index 1198aea,d1840dd..d1840dd --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -2729,7 -2729,7 +2729,7 @@@ out } /** - * batadv_dat_status_update - process incoming tt reply + * batadv_handle_tt_response - process incoming tt reply * @bat_priv: the bat priv with all the soft interface information * @tt_data: tt data containing the tt request information * @resp_src: mac address of tt reply sender diff --combined net/batman-adv/types.h index f323822,04b6b0b..04b6b0b --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@@ -246,8 -246,8 +246,8 @@@ struct batadv_orig_node * @BATADV_ORIG_CAPA_HAS_NC: orig node has network coding enabled */ enum batadv_orig_capabilities { - BATADV_ORIG_CAPA_HAS_DAT = BIT(1), - BATADV_ORIG_CAPA_HAS_NC = BIT(2), + BATADV_ORIG_CAPA_HAS_DAT = BIT(0), + BATADV_ORIG_CAPA_HAS_NC = BIT(1), }; /** -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.12-rc4, created. v3.12-rc4
by postmaster＠open-mesh.org 06 Oct '13

06 Oct '13

The annotated tag, v3.12-rc4 has been created at 3b6a2139d8b69bfc3a95a7b5252967a548c88597 (tag) tagging d0e639c9e06d44e713170031fe05fb60ebe680af (commit) replaces v3.12-rc3 tagged by Linus Torvalds on Sun Oct 6 14:00:35 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.12-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJSUc9zAAoJEHm+PkMAQRiG9DMH/AtpuAF6LlMRPjrCeuJQ1pyh T0IUO+CsLKO6qtM5IyweP8V6zaasNjIuW1+B6IwVIl8aOrM+M7CwRiKvpey26ldM I8G2ron7hqSOSQqSQs20jN2yGAqQGpYIbTmpdGLAjQ350NNNvEKthbP5SZR5PAmE UuIx5OGEkaOyZXvCZJXU9AZkCxbihlMSt2zFVxybq2pwnGezRUYgCigE81aeyE0I QLwzzMVdkCxtZEpkdJMpLILAz22jN4RoVDbXRa2XC7dA9I2PEEXI9CcLzqCsx2Ii 8eYS+no2K5N2rrpER7JFUB2B/2X8FaVDE+aJBCkfbtwaYTV9UYLq3a/sKVpo1Cs= =xSFJ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: fix my e-mail address in the README (9021511)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 90215112702d6a1367497d77f27c5902063ca705 Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Thu Oct 3 16:15:37 2013 +0200 alfred: fix my e-mail address in the README Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 90215112702d6a1367497d77f27c5902063ca705 README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 4706bf5..4a494a4 100644 --- a/README +++ b/README @@ -198,6 +198,6 @@ http://www.open-mesh.org/projects/open-mesh/wiki/Contribute You can also contact the Authors: -Simon Wunderlich <siwu(a)hrz.tu-chmnitz.de> +Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Sven Eckelmann <sven(a)open-mesh.com>

1 0

[alfred] master: alfred: Remove unused check for device MTU (d6de864)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit d6de864b4c653d65a79aed3458f6c049d026e320 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Oct 1 14:02:14 2013 +0200 alfred: Remove unused check for device MTU Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- d6de864b4c653d65a79aed3458f6c049d026e320 netsock.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/netsock.c b/netsock.c index bed62e9..dc57b3c 100644 --- a/netsock.c +++ b/netsock.c @@ -80,11 +80,6 @@ int netsock_open(struct globals *globals) memcpy(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); mac_to_ipv6(&globals->hwaddr, &globals->address); - if (ioctl(sock, SIOCGIFMTU, &ifr) == -1) { - fprintf(stderr, "can't get MTU: %s\n", strerror(errno)); - goto err; - } - if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { fprintf(stderr, "can't bind\n"); goto err;

1 0

[alfred] master: alfred: Try to detect error on socket (02997b2)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 02997b2606b12145a05129de693fa4242f74ad0a Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Oct 1 14:02:11 2013 +0200 alfred: Try to detect error on socket The netdev socket can have an error which needs a reinitialization. Alfred should mark the socket as invalid instead of trying to send over the broken socket. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 02997b2606b12145a05129de693fa4242f74ad0a server.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/server.c b/server.c index 6864c1d..bc3b551 100644 --- a/server.c +++ b/server.c @@ -216,7 +216,7 @@ int alfred_server(struct globals *globals) { int maxsock, ret; struct timespec last_check, now, tv; - fd_set fds; + fd_set fds, errfds; if (create_hashes(globals)) return -1; @@ -253,15 +253,25 @@ int alfred_server(struct globals *globals) maxsock = globals->unix_sock; FD_ZERO(&fds); + FD_ZERO(&errfds); FD_SET(globals->unix_sock, &fds); - if (globals->netsock >= 0) + if (globals->netsock >= 0) { FD_SET(globals->netsock, &fds); - ret = pselect(maxsock + 1, &fds, NULL, NULL, &tv, NULL); + FD_SET(globals->netsock, &errfds); + } + ret = pselect(maxsock + 1, &fds, NULL, &errfds, &tv, NULL); if (ret == -1) { fprintf(stderr, "main loop select failed ...: %s\n", strerror(errno)); } else if (ret) { + if (globals->netsock >= 0 && + FD_ISSET(globals->netsock, &errfds)) { + fprintf(stderr, "Error on netsock detected\n"); + netsock_close(globals->netsock); + globals->netsock = -1; + } + if (FD_ISSET(globals->unix_sock, &fds)) { printf("read unix socket\n"); unix_sock_read(globals);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2013