summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore_Con.am
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-05-22 17:03:26 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-05-24 09:20:49 +0900
commit1eba9d9de026d9ec28aa5b42457b144e437dbfe3 (patch)
treea081fc4b41fc3c79258425953fa4a5792924bc61 /src/Makefile_Ecore_Con.am
parent6e23780bb13fdc16a2034d01bf3fc06a2355fbee (diff)
ecore-con - simplify down to a single libc resolver
Summary: this removes the cares/ares based resolver and the compiled-in dns.c resolver, modified the getaddrinfo based resolver to use threads not forking (almost halving its size) and now makes that the only resolver we have. getaddrinfo handles ipv6 and ipv4 (according to docs). this simplifies code paths, drops code size of the efl tree by about 11k lines of code, makes it easier to test and more robust to future changes with ip resolving as it now just relies on libc. we won't have coverity complaints on dns.c imported code anymore to fix and don't have tokeep up with bugfixes/security from the upstream imported code. this means we use a single resolver on all platforms (windows, mac, linux) as opposed to before where cares was used for windows, and dns.c on linux/mac. oh and the forking original was broken since our move to eo too. so it couldnt even compile if enabled, letalone work. so fix bug with missing /etc/resolv.conf that dns.c couldn't cope with, fix testability, fix maintainability and reduce efl codebase size. this fixes T3668 @fix @improve Subscribers: cedric, seoz, jpeg Maniphest Tasks: T3668 Differential Revision: https://phab.enlightenment.org/D3971
Diffstat (limited to 'src/Makefile_Ecore_Con.am')
-rw-r--r--src/Makefile_Ecore_Con.am20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 266e7b4f74..d68a777951 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -51,7 +51,8 @@ lib/ecore_con/ecore_con_url_curl.c \
51lib/ecore_con/ecore_con_url_curl.h \ 51lib/ecore_con/ecore_con_url_curl.h \
52static_libs/http-parser/http_parser.c \ 52static_libs/http-parser/http_parser.c \
53static_libs/http-parser/http_parser.h \ 53static_libs/http-parser/http_parser.h \
54lib/ecore_con/ecore_con_private.h 54lib/ecore_con/ecore_con_private.h \
55lib/ecore_con/ecore_con_info.c
55 56
56EXTRA_DIST += lib/ecore_con/ecore_con_legacy.c 57EXTRA_DIST += lib/ecore_con/ecore_con_legacy.c
57 58
@@ -61,19 +62,6 @@ else
61lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local.c 62lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local.c
62endif 63endif
63 64
64if HAVE_CARES
65lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_ares.c
66else
67if HAVE_IPV6
68lib_ecore_con_libecore_con_la_SOURCES += \
69lib/ecore_con/ecore_con_dns.c \
70static_libs/dns/dns.c \
71static_libs/dns/dns.h
72else
73lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c
74endif
75endif
76
77lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_CON_CFLAGS@ 65lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_CON_CFLAGS@
78lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@ @EVIL_LIBS@ 66lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@ @EVIL_LIBS@
79lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@ 67lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
@@ -81,10 +69,6 @@ lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
81 69
82lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser 70lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser
83 71
84if HAVE_IPV6
85lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/dns/
86endif
87
88EXTRA_DIST += \ 72EXTRA_DIST += \
89tests/ecore_con/server.key \ 73tests/ecore_con/server.key \
90tests/ecore_con/server.pem \ 74tests/ecore_con/server.pem \