search

bmx-routing / bmx7

BMX7 / SEMTOR Securely Entrusted Mesh Routing Protocol
GNU General Public License v2.0
63 stars 15 forks source link

rename list_add_tail and struct list_head #35

Closed dangowrt closed 5 years ago

dangowrt commented 6 years ago

Rename some list stuff to avoid namespace collision with libubox. Unfortunately the list implementation in bmx7 grew too much apart from what is included in libubox today, so simply rename the currently colliding names so they can co-exist. Fixes build of bmx7_iwinfo which indirectly includes libubox.

aparcar commented 6 years ago

I guess you tested it and it works - then I'd merge it

axn commented 6 years ago

I actually favour to remain independent of libubox to facilitate installation on non openwork systems

Am 14. August 2018 12:26:17 MESZ schrieb Daniel Golle notifications@github.com:

Rename some list stuff to avoid namespace collision with libubox. Unfortunately the list implementation in bmx7 grew too much apart from what is included in libubox today, so simply rename the currently colliding names so they can co-exist. Fixes build of bmx7_iwinfo which indirectly includes libubox. You can view, comment on, or merge this pull request online at:

https://github.com/bmx-routing/bmx7/pull/35

-- Commit Summary --

  • rename list_add_tail and struct list_head

-- File Changes --

M control.c (18) M control.h (12) M lib/bmx7_tun/tun.c (2) M list.c (26) M list.h (36) M msg.h (2) M plugin.c (8) M plugin.h (2) M schedule.c (2) M tun.h (2)

-- Patch Links --

https://github.com/bmx-routing/bmx7/pull/35.patch https://github.com/bmx-routing/bmx7/pull/35.diff

-- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/bmx-routing/bmx7/pull/35

-- Diese Nachricht wurde von meinem Android-Gerät mit K-9 Mail gesendet.

dangowrt commented 6 years ago

On Tue, Aug 14, 2018 at 03:39:19AM -0700, Paul Spooren wrote:

I guess you tested it and it works?

Yep, otherwise I wouldn't PR. It fixes the build and supposedly works just like it did before the indirect inclusion of libubox' list code via the iwinfo plugin.

dangowrt commented 6 years ago

I actually favour to remain independent of libubox to facilitate installation on non openwork systems

libubox is a library available and functional also independently of OpenWrt. Many distributions (eg. archlinux) provide it as a package and literally all router platforms ship it by default. Anyway, the list implementations in libubox and bmx7 have diverged to a degree that makes it too much work for the little amount of shared code. I hence opted for renaming the colliding identifiers in bmx7.