Openwrt: Compilation error with --enable-redir

[drkhosla]

I am trying to compile latest coova chilli 06th Jan, 2016 using openwrt r48251. I think it is long pending issue.

libtool: compile:  mips-openwrt-linux-musl-gcc -DHAVE_CONFIG_H -I. -I.. -I/var/firmware/openwrt/staging_dir/target-mips_34kc_musl-1.1.11/usr/include -I/var/firmware/openwrt/staging_dir/target-mips_34kc_musl-1.1.11/include -I/var/firmware/openwrt/staging_dir/toolchain-mips_34kc_gcc-5.2.0_musl-1.1.11/usr/include -I/var/firmware/openwrt/staging_dir/toolchain-mips_34kc_gcc-5.2.0_musl-1.1.11/include/fortify -I/var/firmware/openwrt/staging_dir/toolchain-mips_34kc_gcc-5.2.0_musl-1.1.11/include -D_GNU_SOURCE -Wall -Werror -fno-builtin -fno-strict-aliasing -O2 -fomit-frame-pointer -funroll-loops -pipe -I../bstring -DDEFCHILLICONF=\"/etc/chilli.conf\" -DDEFPIDFILE=\"/var/run/chilli.pid\" -DDEFSTATEDIR=\"/var/run\" -DSBINDIR=\"/usr/sbin\" -Os -pipe -mno-branch-likely -mips32r2 -mtune=34kc -fno-caller-saves -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result -msoft-float -mips16 -minterlink-mips16 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -fpic -MT options.lo -MD -MP -MF .deps/options.Tpo -c options.c  -fPIC -DPIC -o .libs/options.o
options.c: In function 'options_fromfd':
options.c:381:48: error: 'regex_t {aka struct re_pattern_buffer}' has no member named 'allocated'
     if (_options.regex_pass_throughs[i].re_host.allocated)
                                                ^
options.c:383:48: error: 'regex_t {aka struct re_pattern_buffer}' has no member named 'allocated'
     if (_options.regex_pass_throughs[i].re_path.allocated)
                                                ^
options.c:385:46: error: 'regex_t {aka struct re_pattern_buffer}' has no member named 'allocated'
     if (_options.regex_pass_throughs[i].re_qs.allocated)
                                              ^
make[7]: *** [options.lo] Error 1
make[7]: Leaving directory `/var/firmware/openwrt/build_dir/target-mips_34kc_musl-1.1.11/coova-chilli-1.3.0+20160106/src'
make[6]: *** [all-recursive] Error 1
make[6]: Leaving directory `/var/firmware/openwrt/build_dir/target-mips_34kc_musl-1.1.11/coova-chilli-1.3.0+20160106/src'
make[5]: *** [all-recursive] Error 1
make[5]: Leaving directory `/var/firmware/openwrt/build_dir/target-mips_34kc_musl-1.1.11/coova-chilli-1.3.0+20160106'
make[4]: *** [all] Error 2
make[4]: Leaving directory `/var/firmware/openwrt/build_dir/target-mips_34kc_musl-1.1.11/coova-chilli-1.3.0+20160106'
make[3]: *** [/var/firmware/openwrt/build_dir/target-mips_34kc_musl-1.1.11/coova-chilli-1.3.0+20160106/.built] Error 2
make[3]: Leaving directory `/var/firmware/drkhosla/coova-chilli'
make[2]: *** [package/feeds/drkhosla/coova-chilli/compile] Error 2
make[2]: Leaving directory `/var/firmware/openwrt'
make[1]: *** [/var/firmware/openwrt/staging_dir/target-mips_34kc_musl-1.1.11/stamp/.package_compile] Error 2
make[1]: Leaving directory `/var/firmware/openwrt'
make: *** [world] Error 2

[CristiCimpianu]

with a little patch 0d523af to work with uclibc the latest git coova compiled for me in openwrt

[xewonder]

Hi,

Having this problem today...
What files do you have to patch up?

Thanks

[nzamps]

Try:

--- a/system.h
+++ b/system.h
@@ -117,18 +117,6 @@
 #include <inttypes.h>
 #endif

-#if defined(__linux__)
-#include <asm/types.h>
-#include <linux/if.h>
-#include <linux/if_packet.h>
-#include <linux/if_ether.h>
-#include <linux/if_tun.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#ifndef HAVE_SYS_UN_H
-#include <linux/un.h>
-#endif
-
 #ifdef HAVE_SYS_SYSINFO_H
 #include <sys/sysinfo.h>
 #else
@@ -244,6 +232,20 @@
 #include <unistd.h>
 #include <errno.h>

+#if defined(__linux__)
+#include <asm/types.h>
+#include <linux/if.h>
+#include <linux/if_packet.h>
+#include <linux/if_ether.h>
+#include <linux/if_tun.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/if_vlan.h>
+#include <linux/sockios.h>
+#ifndef HAVE_SYS_UN_H
+#include <linux/un.h>
+#endif
+
 int safe_accept(int fd, struct sockaddr *sa, socklen_t *lenptr);
 int safe_select(int nfds, fd_set *readfds, fd_set *writefds,
        fd_set *exceptfds, struct timeval *timeout);

[drkhosla]

I tried to patch both configure and system.h but error is still persist. Actually musl library missing variable allocated https://fossies.org/dox/musl-1.1.15/structre__pattern__buffer.html.

I tried following patch to compile it successful

+++a/src/options.c
+++ b/src/options.c
@@ -373,7 +373,7 @@

 #ifdef ENABLE_CHILLIREDIR
   for (i = 0; i < MAX_REGEX_PASS_THROUGHS; i++) {
-#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
+#if defined (__linux__) || (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
     regfree(&_options.regex_pass_throughs[i].re_host);
     regfree(&_options.regex_pass_throughs[i].re_path);
     regfree(&_options.regex_pass_throughs[i].re_qs);

--- a/src/main-redir.c
+++ b/src/main-redir.c
@@ -510,12 +510,6 @@
   log_dbg("Checking %s =~ %s", s, regex);
 #endif

-#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
-  if (!re->re_g)
-#else
-  if (!re->allocated) 
-#endif
-  {
     if ((ret = regcomp(re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
       char error[512];
       regerror(ret, re, error, sizeof(error));
@@ -523,7 +517,6 @@
       regex[0] = 0;
       return -1;
     }
-  }

   if ((ret = regexec(re, s, 0, 0, 0)) == 0) { 

[alex-eri]

last patch not working. Have someone built chilli with regex?