ChronosXYZ/netsukuku
1
0
Fork 0
mirror of https://github.com/ChronosX88/netsukuku.git synced 2024-10-18 09:21:01 +00:00
Code Issues Projects Releases Wiki Activity

build: Cleanup, add qspn to default build

Browse Source
This commit is contained in:
Alexander von Gluck IV 2014-09-17 07:28:51 -05:00
parent 6dacd92b5c
commit 5d78d45402
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/SConscript
View File

@ -26,22 +26,24 @@ NTK_VERSION="0.0.9b"
# Sources and libs # Sources and libs
# #
sources_common = Split('xmalloc.c log.c misc.c buffer.c endianness.c') sources_common = ['xmalloc.c', 'log.c', 'misc.c', 'buffer.c', 'endianness.c']
sources_qspn = Split('qspn-empiric.c') + sources_common
sources_netsukuku = Split("""accept.c llist.c ipv6-gmp.c inet.c request.c map.c sources_qspn = ['qspn-empiric.c'] + sources_common
gmap.c bmap.c pkts.c radar.c hook.c rehook.c tracer.c qspn.c sources_netsukuku = ['accept.c', 'llist.c', 'ipv6-gmp.c', 'inet.c', 'request.c',
hash.c daemon.c crypto.c snsd_cache.c 'map.c', 'gmap.c', 'bmap.c', 'pkts.c', 'radar.c', 'hook.c',
andna_cache.c andna.c andns_lib.c err_errno.c 'rehook.c', 'tracer.c', 'qspn.c', 'hash.c', 'daemon.c',
dnslib.c andns.c andns_net.c andns_snsd.c 'crypto.c', 'snsd_cache.c', 'andna_cache.c', 'andna.c',
ll_map.c libnetlink.c if.c krnl_route.c krnl_rule.c 'andns_lib.c', 'err_errno.c', 'dnslib.c', 'andns.c',
iptunnel.c route.c conf.c dns_wrapper.c igs.c mark.c 'andns_net.c', 'andns_snsd.c', 'll_map.c', 'libnetlink.c',
libiptc/libip4tc.c libping.c ntk-console-server.c 'if.c', 'krnl_route.c', 'krnl_rule.c', 'iptunnel.c',
netsukuku.c""") + sources_common 'route.c', 'conf.c', 'dns_wrapper.c', 'igs.c', 'mark.c',
sources_ntkresolv = sources_common + Split("""andns_lib.c ntkresolv.c andns_net.c 'libiptc/libip4tc.c', 'libping.c', 'ntk-console-server.c',
crypto.c snsd_cache.c inet.c 'netsukuku.c'] + sources_common
ll_map.c libnetlink.c sources_ntkresolv = ['andns_lib.c', 'andns_net.c', 'crypto.c', 'snsd_cache.c',
err_errno.c""") 'inet.c', 'll_map.c', 'libnetlink.c', 'err_errno.c',
sources_ntkconsole = Split('ntk-console.c') 'ntkresolv.c'] + sources_common
sources_ntkconsole = ['ntk-console.c']
libs = ['gmp', 'pthread', 'crypto', 'z'] libs = ['gmp', 'pthread', 'crypto', 'z']
@ -157,7 +159,7 @@ qspn = env.Program('qspn-empiric', sources_qspn, LIBS = libs, CPPPATH = '.')
ntkresolv = env.Program('ntk-resolv', sources_ntkresolv, LIBS = libs, CPPPATH = '.') ntkresolv = env.Program('ntk-resolv', sources_ntkresolv, LIBS = libs, CPPPATH = '.')
ntkconsole = env.Program('ntk-console', sources_ntkconsole, LIBS = libs, CPPPATH = '.', CFLAGS = '-std=c99') ntkconsole = env.Program('ntk-console', sources_ntkconsole, LIBS = libs, CPPPATH = '.', CFLAGS = '-std=c99')
Default(ntkd, ntkresolv, ntkconsole) Default(ntkd, ntkresolv, ntkconsole, qspn)
# #

4
src/qspn-empiric.c
View File

@ -1164,10 +1164,6 @@ int main(int argc, char **argv)
log_init(argv[0], 1, 1); log_init(argv[0], 1, 1);
clear_all(); clear_all();
#ifndef QSPN_EMPIRIC
fatal("QSPN_EMPIRIC is not enabled! Aborting.");
#endif
for(i=0; i<MAXGROUPNODE; i++) for(i=0; i<MAXGROUPNODE; i++)
pthread_mutex_init(&mutex[i], NULL); pthread_mutex_init(&mutex[i], NULL);