Page 1 of 1

ipoe: many many changes

Posted: 13 Mar 2016, 08:40
by Dmitry

Code: Select all

commit c45b00d84de954d7f27fc7dce2909fab198cc298
Author: Dmitry Kozlov <xeb@mail.ru>
Date:   Sun Mar 13 00:20:49 2016 +0300

    ipoe: many many changes
Внесено много изменений, вычищен код, переработан драйвер ipoe.
Всё оттестировать нет возможности, так что может что-то не работать.
local-net больше не нужно указывать, он использовался для выделения клиентского трафика, теперь весь трафик на указанных интерфейсах считается клиентским

Re: ipoe: many many changes

Posted: 13 Mar 2016, 20:25
by ultrawave
Hi Dmitry,

It's happening some errors during compilation.

Code: Select all

inux ipoe-server-04 4.2.0-27-generic #32~14.04.1-Ubuntu

Code: Select all

[ 61%] Building C object accel-pppd/ctrl/ipoe/CMakeFiles/ipoe.dir/lua.c.o
In file included from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/ipoe.h:6:0,
                 from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/lua.c:16:
/usr/include/linux/if.h:143:8: error: redefinition of ‘struct ifmap’
 struct ifmap {
        ^
In file included from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/lua.c:5:0:
/usr/include/net/if.h:111:8: note: originally defined here
 struct ifmap
        ^
In file included from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/ipoe.h:6:0,
                 from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/lua.c:16:
/usr/include/linux/if.h:177:8: error: redefinition of ‘struct ifreq’
 struct ifreq {
        ^
In file included from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/lua.c:5:0:
/usr/include/net/if.h:126:8: note: originally defined here
 struct ifreq
        ^
In file included from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/ipoe.h:6:0,
                 from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/lua.c:16:
/usr/include/linux/if.h:226:8: error: redefinition of ‘struct ifconf’
 struct ifconf  {
        ^
In file included from /root/accel-ppp.git/accel-pppd/ctrl/ipoe/lua.c:5:0:
/usr/include/net/if.h:176:8: note: originally defined here
 struct ifconf
        ^
make[2]: ** [accel-pppd/ctrl/ipoe/CMakeFiles/ipoe.dir/lua.c.o] Erro 1
make[1]: ** [accel-pppd/ctrl/ipoe/CMakeFiles/ipoe.dir/all] Erro 2
make: ** [all] Erro 2
Best regards.

Re: ipoe: many many changes

Posted: 14 Mar 2016, 03:31
by stasn77

Code: Select all

--- a/accel-pppd/ctrl/ipoe/lua.c.orig
+++ b/accel-pppd/ctrl/ipoe/lua.c
@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <pthread.h>
-#include <net/if.h>

 /* Include the Lua API header files. */
 #include <lua.h>


Re: ipoe: many many changes

Posted: 14 Mar 2016, 10:30
by Dmitry
commit 556d5be02ba0c30f2e33f9d97779827e169dff65