Skip to content

Commit 7c89c87

Browse files
author
Bogdan Drozdowski
committed
Merge branch 'dev'
2 parents c6a8f81 + 98f97e3 commit 7c89c87

File tree

11 files changed

+108
-59
lines changed

11 files changed

+108
-59
lines changed

‎src/lhip_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ shp_cp_i __lhip_real_gethostbyname2_loc (LHIP_VOID)
495495

496496
/* =============================================================== */
497497

498-
i_cp_i_shp_cp_s_shpp_i __lhip_real_gethostbyname2_r_loc (LHIP_VOID)
498+
i_cp_i_shp_cp_s_shpp_i __lhip_r_gethostbyname2_r_loc (LHIP_VOID)
499499
{
500500
return __lhip_real_gethostbyname2_r;
501501
}
@@ -761,7 +761,7 @@ ccp_cpp_i_ucp_i __lhip_real_res_querydomain_loc (LHIP_VOID)
761761

762762
/* =============================================================== */
763763

764-
r_ccp_cpp_i_ucp_i __lhip_real_res_nquerydomain_loc (LHIP_VOID)
764+
r_ccp_cpp_i_ucp_i __lhip_r_res_nquerydomain_loc (LHIP_VOID)
765765
{
766766
return __lhip_real_res_nquerydomain;
767767
}

‎src/lhip_net.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ gethostbyname2_r (
680680
fflush (stderr);
681681
#endif
682682

683-
if ( __lhip_real_gethostbyname2_r_loc () == NULL )
683+
if ( __lhip_r_gethostbyname2_r_loc () == NULL )
684684
{
685685
LHIP_SET_ERRNO_MISSING();
686686
return -1;
@@ -689,19 +689,19 @@ gethostbyname2_r (
689689
if ( (name == NULL) || (ret == NULL) )
690690
{
691691
LHIP_SET_ERRNO(err);
692-
return (*__lhip_real_gethostbyname2_r_loc ())
692+
return (*__lhip_r_gethostbyname2_r_loc ())
693693
(name, af, ret, buf, buflen, result, h_errnop);
694694
}
695695

696696
if ( (__lhip_check_prog_ban () != 0)
697697
|| (__lhip_get_init_stage() != LHIP_INIT_STAGE_FULLY_INITIALIZED) )
698698
{
699699
LHIP_SET_ERRNO(err);
700-
return (*__lhip_real_gethostbyname2_r_loc ())
700+
return (*__lhip_r_gethostbyname2_r_loc ())
701701
(name, af, ret, buf, buflen, result, h_errnop);
702702
}
703703

704-
my_ret = (*__lhip_real_gethostbyname2_r_loc ())
704+
my_ret = (*__lhip_r_gethostbyname2_r_loc ())
705705
(name, af, ret, buf, buflen, result, h_errnop);
706706
if ( my_ret == 0 )
707707
{

‎src/lhip_priv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ extern GCC_WARN_UNUSED_RESULT i_vp_sl_i_shp_cp_s_shpp_ip __lhip_real_gethostbyad
428428
extern GCC_WARN_UNUSED_RESULT shp_cp __lhip_real_gethostbyname_loc LHIP_PARAMS ((void));
429429
extern GCC_WARN_UNUSED_RESULT i_cp_shp_cp_s_shpp_ip __lhip_real_gethostbyname_r_loc LHIP_PARAMS ((void));
430430
extern GCC_WARN_UNUSED_RESULT shp_cp_i __lhip_real_gethostbyname2_loc LHIP_PARAMS ((void));
431-
extern GCC_WARN_UNUSED_RESULT i_cp_i_shp_cp_s_shpp_i __lhip_real_gethostbyname2_r_loc LHIP_PARAMS ((void));
431+
extern GCC_WARN_UNUSED_RESULT i_cp_i_shp_cp_s_shpp_i __lhip_r_gethostbyname2_r_loc LHIP_PARAMS ((void));
432432
extern GCC_WARN_UNUSED_RESULT shp_v __lhip_real_gethostent_location LHIP_PARAMS ((void));
433433
extern GCC_WARN_UNUSED_RESULT i_shp_cp_s_shpp_ip __lhip_real_gethostent_r_loc LHIP_PARAMS ((void));
434434
extern GCC_WARN_UNUSED_RESULT shp_cp_s_i_ip __lhip_real_getipnodebyaddr_loc LHIP_PARAMS ((void));
@@ -474,7 +474,7 @@ extern GCC_WARN_UNUSED_RESULT r_ccp_i_ucp_i __lhip_real_res_nquery_location LH
474474
extern GCC_WARN_UNUSED_RESULT ccp_i_ucp_i __lhip_real_res_search_location LHIP_PARAMS ((void));
475475
extern GCC_WARN_UNUSED_RESULT r_ccp_i_ucp_i __lhip_real_res_nsearch_loc LHIP_PARAMS ((void));
476476
extern GCC_WARN_UNUSED_RESULT ccp_cpp_i_ucp_i __lhip_real_res_querydomain_loc LHIP_PARAMS ((void));
477-
extern GCC_WARN_UNUSED_RESULT r_ccp_cpp_i_ucp_i __lhip_real_res_nquerydomain_loc LHIP_PARAMS ((void));
477+
extern GCC_WARN_UNUSED_RESULT r_ccp_cpp_i_ucp_i __lhip_r_res_nquerydomain_loc LHIP_PARAMS ((void));
478478
extern GCC_WARN_UNUSED_RESULT i_ccp_i_i_cucp_i_cucp_ucp_i __lhip_real_res_mkquery_loc LHIP_PARAMS ((void));
479479
extern GCC_WARN_UNUSED_RESULT r_i_ccp_i_i_cucp_i_cucp_ucp_i __lhip_real_res_nmkquery_loc LHIP_PARAMS ((void));
480480

‎src/lhip_resolve.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,23 +416,23 @@ res_nquerydomain (
416416
fflush (stderr);
417417
#endif
418418

419-
if ( __lhip_real_res_nquerydomain_loc () == NULL )
419+
if ( __lhip_r_res_nquerydomain_loc () == NULL )
420420
{
421421
return -1;
422422
}
423423

424424
if ( (__lhip_check_prog_ban () != 0)
425425
|| (__lhip_get_init_stage() != LHIP_INIT_STAGE_FULLY_INITIALIZED) )
426426
{
427-
return (*__lhip_real_res_nquerydomain_loc ()) (statep, name, domain, class, type, answer, anslen);
427+
return (*__lhip_r_res_nquerydomain_loc ()) (statep, name, domain, class, type, answer, anslen);
428428
}
429429

430430
if ( __lhip_is_forbidden_name (name) != 0 )
431431
{
432432
return -1;
433433
}
434434

435-
return (*__lhip_real_res_nquerydomain_loc ()) (statep, name, domain, class, type, answer, anslen);
435+
return (*__lhip_r_res_nquerydomain_loc ()) (statep, name, domain, class, type, answer, anslen);
436436
}
437437

438438
/* =============================================================== */

‎test/Makefile.am

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,39 +34,50 @@ check_PROGRAMS = lhiptest_banning lhiptest_exec lhiptest_ioctl lhiptest_net \
3434
EXTRA_DIST = lhiptest_common.h
3535
LHIPTEST_COMMON_SRC = lhiptest_common.c lhiptest_common.h
3636
LHIPTEST_COMMON_CFLAGS = @CHECK_CFLAGS@ -DHAVE_CONFIG_H -I $(top_builddir)/src
37-
LHIPTEST_COMMON_LIB = $(top_builddir)/src/libhideip.la @CHECK_LIBS@ @LIBS@
37+
LHIPTEST_COMMON_LIB = $(top_builddir)/src/lhip_main.o \
38+
$(top_builddir)/src/lhip_addr.o \
39+
$(top_builddir)/src/lhip_banning.o \
40+
@CHECK_LIBS@ @LIBS@
3841

3942
lhiptest_banning_SOURCES = lhiptest_banning.c $(LHIPTEST_COMMON_SRC)
4043
lhiptest_banning_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
4144
lhiptest_banning_LDADD = $(LHIPTEST_COMMON_LIB)
4245

4346
lhiptest_exec_SOURCES = lhiptest_exec.c $(LHIPTEST_COMMON_SRC)
4447
lhiptest_exec_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
45-
lhiptest_exec_LDADD = $(LHIPTEST_COMMON_LIB)
48+
lhiptest_exec_LDADD = $(LHIPTEST_COMMON_LIB) \
49+
$(top_builddir)/src/lhip_exec.o
4650

4751
lhiptest_ioctl_SOURCES = lhiptest_ioctl.c $(LHIPTEST_COMMON_SRC)
4852
lhiptest_ioctl_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
49-
lhiptest_ioctl_LDADD = $(LHIPTEST_COMMON_LIB)
53+
lhiptest_ioctl_LDADD = $(LHIPTEST_COMMON_LIB) \
54+
$(top_builddir)/src/lhip_ioctl.o
5055

5156
lhiptest_net_SOURCES = lhiptest_net.c $(LHIPTEST_COMMON_SRC)
5257
lhiptest_net_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
53-
lhiptest_net_LDADD = $(LHIPTEST_COMMON_LIB)
58+
lhiptest_net_LDADD = $(LHIPTEST_COMMON_LIB) \
59+
$(top_builddir)/src/lhip_net.o
5460

5561
lhiptest_opens_SOURCES = lhiptest_opens.c $(LHIPTEST_COMMON_SRC)
5662
lhiptest_opens_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
57-
lhiptest_opens_LDADD = $(LHIPTEST_COMMON_LIB)
63+
lhiptest_opens_LDADD = $(LHIPTEST_COMMON_LIB) \
64+
$(top_builddir)/src/lhip_opens.o \
65+
$(top_builddir)/src/lhip_exec.o
5866

5967
lhiptest_pcap_SOURCES = lhiptest_pcap.c $(LHIPTEST_COMMON_SRC)
6068
lhiptest_pcap_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
61-
lhiptest_pcap_LDADD = $(LHIPTEST_COMMON_LIB)
69+
lhiptest_pcap_LDADD = $(LHIPTEST_COMMON_LIB) \
70+
$(top_builddir)/src/lhip_pcap.o
6271

6372
lhiptest_resolve_SOURCES = lhiptest_resolve.c $(LHIPTEST_COMMON_SRC)
6473
lhiptest_resolve_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
65-
lhiptest_resolve_LDADD = $(LHIPTEST_COMMON_LIB)
74+
lhiptest_resolve_LDADD = $(LHIPTEST_COMMON_LIB) \
75+
$(top_builddir)/src/lhip_resolve.o
6676

6777
lhiptest_uname_SOURCES = lhiptest_uname.c $(LHIPTEST_COMMON_SRC)
6878
lhiptest_uname_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
69-
lhiptest_uname_LDADD = $(LHIPTEST_COMMON_LIB)
79+
lhiptest_uname_LDADD = $(LHIPTEST_COMMON_LIB) \
80+
$(top_builddir)/src/lhip_uname.o
7081

7182
lhiptest_other_SOURCES = lhiptest_other.c $(LHIPTEST_COMMON_SRC)
7283
lhiptest_other_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)

‎test/Makefile.in

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ am__lhiptest_banning_SOURCES_DIST = lhiptest_banning.c \
153153
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_1)
154154
lhiptest_banning_OBJECTS = $(am_lhiptest_banning_OBJECTS)
155155
@LHIP_TESTS_ENABLED_TRUE@am__DEPENDENCIES_1 = \
156-
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/libhideip.la
156+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_main.o \
157+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_addr.o \
158+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_banning.o
157159
@LHIP_TESTS_ENABLED_TRUE@lhiptest_banning_DEPENDENCIES = \
158160
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
159161
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -171,7 +173,8 @@ am__lhiptest_exec_SOURCES_DIST = lhiptest_exec.c lhiptest_common.c \
171173
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_2)
172174
lhiptest_exec_OBJECTS = $(am_lhiptest_exec_OBJECTS)
173175
@LHIP_TESTS_ENABLED_TRUE@lhiptest_exec_DEPENDENCIES = \
174-
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
176+
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \
177+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_exec.o
175178
lhiptest_exec_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
176179
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lhiptest_exec_CFLAGS) \
177180
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -182,7 +185,8 @@ am__lhiptest_ioctl_SOURCES_DIST = lhiptest_ioctl.c lhiptest_common.c \
182185
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_3)
183186
lhiptest_ioctl_OBJECTS = $(am_lhiptest_ioctl_OBJECTS)
184187
@LHIP_TESTS_ENABLED_TRUE@lhiptest_ioctl_DEPENDENCIES = \
185-
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
188+
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \
189+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_ioctl.o
186190
lhiptest_ioctl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
187191
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
188192
$(lhiptest_ioctl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
@@ -195,7 +199,8 @@ am__lhiptest_net_SOURCES_DIST = lhiptest_net.c lhiptest_common.c \
195199
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_4)
196200
lhiptest_net_OBJECTS = $(am_lhiptest_net_OBJECTS)
197201
@LHIP_TESTS_ENABLED_TRUE@lhiptest_net_DEPENDENCIES = \
198-
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
202+
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \
203+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_net.o
199204
lhiptest_net_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
200205
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lhiptest_net_CFLAGS) \
201206
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -206,7 +211,9 @@ am__lhiptest_opens_SOURCES_DIST = lhiptest_opens.c lhiptest_common.c \
206211
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_5)
207212
lhiptest_opens_OBJECTS = $(am_lhiptest_opens_OBJECTS)
208213
@LHIP_TESTS_ENABLED_TRUE@lhiptest_opens_DEPENDENCIES = \
209-
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
214+
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \
215+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_opens.o \
216+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_exec.o
210217
lhiptest_opens_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
211218
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
212219
$(lhiptest_opens_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
@@ -230,7 +237,8 @@ am__lhiptest_pcap_SOURCES_DIST = lhiptest_pcap.c lhiptest_common.c \
230237
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_7)
231238
lhiptest_pcap_OBJECTS = $(am_lhiptest_pcap_OBJECTS)
232239
@LHIP_TESTS_ENABLED_TRUE@lhiptest_pcap_DEPENDENCIES = \
233-
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
240+
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \
241+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_pcap.o
234242
lhiptest_pcap_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
235243
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lhiptest_pcap_CFLAGS) \
236244
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -241,7 +249,8 @@ am__lhiptest_resolve_SOURCES_DIST = lhiptest_resolve.c \
241249
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_8)
242250
lhiptest_resolve_OBJECTS = $(am_lhiptest_resolve_OBJECTS)
243251
@LHIP_TESTS_ENABLED_TRUE@lhiptest_resolve_DEPENDENCIES = \
244-
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
252+
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \
253+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_resolve.o
245254
lhiptest_resolve_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
246255
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
247256
$(lhiptest_resolve_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
@@ -253,7 +262,8 @@ am__lhiptest_uname_SOURCES_DIST = lhiptest_uname.c lhiptest_common.c \
253262
@LHIP_TESTS_ENABLED_TRUE@ $(am__objects_9)
254263
lhiptest_uname_OBJECTS = $(am_lhiptest_uname_OBJECTS)
255264
@LHIP_TESTS_ENABLED_TRUE@lhiptest_uname_DEPENDENCIES = \
256-
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1)
265+
@LHIP_TESTS_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \
266+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_uname.o
257267
lhiptest_uname_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
258268
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
259269
$(lhiptest_uname_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
@@ -692,31 +702,50 @@ top_srcdir = @top_srcdir@
692702
@LHIP_TESTS_ENABLED_TRUE@EXTRA_DIST = lhiptest_common.h
693703
@LHIP_TESTS_ENABLED_TRUE@LHIPTEST_COMMON_SRC = lhiptest_common.c lhiptest_common.h
694704
@LHIP_TESTS_ENABLED_TRUE@LHIPTEST_COMMON_CFLAGS = @CHECK_CFLAGS@ -DHAVE_CONFIG_H -I $(top_builddir)/src
695-
@LHIP_TESTS_ENABLED_TRUE@LHIPTEST_COMMON_LIB = $(top_builddir)/src/libhideip.la @CHECK_LIBS@ @LIBS@
705+
@LHIP_TESTS_ENABLED_TRUE@LHIPTEST_COMMON_LIB = $(top_builddir)/src/lhip_main.o \
706+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_addr.o \
707+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_banning.o \
708+
@LHIP_TESTS_ENABLED_TRUE@ @CHECK_LIBS@ @LIBS@
709+
696710
@LHIP_TESTS_ENABLED_TRUE@lhiptest_banning_SOURCES = lhiptest_banning.c $(LHIPTEST_COMMON_SRC)
697711
@LHIP_TESTS_ENABLED_TRUE@lhiptest_banning_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
698712
@LHIP_TESTS_ENABLED_TRUE@lhiptest_banning_LDADD = $(LHIPTEST_COMMON_LIB)
699713
@LHIP_TESTS_ENABLED_TRUE@lhiptest_exec_SOURCES = lhiptest_exec.c $(LHIPTEST_COMMON_SRC)
700714
@LHIP_TESTS_ENABLED_TRUE@lhiptest_exec_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
701-
@LHIP_TESTS_ENABLED_TRUE@lhiptest_exec_LDADD = $(LHIPTEST_COMMON_LIB)
715+
@LHIP_TESTS_ENABLED_TRUE@lhiptest_exec_LDADD = $(LHIPTEST_COMMON_LIB) \
716+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_exec.o
717+
702718
@LHIP_TESTS_ENABLED_TRUE@lhiptest_ioctl_SOURCES = lhiptest_ioctl.c $(LHIPTEST_COMMON_SRC)
703719
@LHIP_TESTS_ENABLED_TRUE@lhiptest_ioctl_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
704-
@LHIP_TESTS_ENABLED_TRUE@lhiptest_ioctl_LDADD = $(LHIPTEST_COMMON_LIB)
720+
@LHIP_TESTS_ENABLED_TRUE@lhiptest_ioctl_LDADD = $(LHIPTEST_COMMON_LIB) \
721+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_ioctl.o
722+
705723
@LHIP_TESTS_ENABLED_TRUE@lhiptest_net_SOURCES = lhiptest_net.c $(LHIPTEST_COMMON_SRC)
706724
@LHIP_TESTS_ENABLED_TRUE@lhiptest_net_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
707-
@LHIP_TESTS_ENABLED_TRUE@lhiptest_net_LDADD = $(LHIPTEST_COMMON_LIB)
725+
@LHIP_TESTS_ENABLED_TRUE@lhiptest_net_LDADD = $(LHIPTEST_COMMON_LIB) \
726+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_net.o
727+
708728
@LHIP_TESTS_ENABLED_TRUE@lhiptest_opens_SOURCES = lhiptest_opens.c $(LHIPTEST_COMMON_SRC)
709729
@LHIP_TESTS_ENABLED_TRUE@lhiptest_opens_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
710-
@LHIP_TESTS_ENABLED_TRUE@lhiptest_opens_LDADD = $(LHIPTEST_COMMON_LIB)
730+
@LHIP_TESTS_ENABLED_TRUE@lhiptest_opens_LDADD = $(LHIPTEST_COMMON_LIB) \
731+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_opens.o \
732+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_exec.o
733+
711734
@LHIP_TESTS_ENABLED_TRUE@lhiptest_pcap_SOURCES = lhiptest_pcap.c $(LHIPTEST_COMMON_SRC)
712735
@LHIP_TESTS_ENABLED_TRUE@lhiptest_pcap_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
713-
@LHIP_TESTS_ENABLED_TRUE@lhiptest_pcap_LDADD = $(LHIPTEST_COMMON_LIB)
736+
@LHIP_TESTS_ENABLED_TRUE@lhiptest_pcap_LDADD = $(LHIPTEST_COMMON_LIB) \
737+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_pcap.o
738+
714739
@LHIP_TESTS_ENABLED_TRUE@lhiptest_resolve_SOURCES = lhiptest_resolve.c $(LHIPTEST_COMMON_SRC)
715740
@LHIP_TESTS_ENABLED_TRUE@lhiptest_resolve_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
716-
@LHIP_TESTS_ENABLED_TRUE@lhiptest_resolve_LDADD = $(LHIPTEST_COMMON_LIB)
741+
@LHIP_TESTS_ENABLED_TRUE@lhiptest_resolve_LDADD = $(LHIPTEST_COMMON_LIB) \
742+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_resolve.o
743+
717744
@LHIP_TESTS_ENABLED_TRUE@lhiptest_uname_SOURCES = lhiptest_uname.c $(LHIPTEST_COMMON_SRC)
718745
@LHIP_TESTS_ENABLED_TRUE@lhiptest_uname_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
719-
@LHIP_TESTS_ENABLED_TRUE@lhiptest_uname_LDADD = $(LHIPTEST_COMMON_LIB)
746+
@LHIP_TESTS_ENABLED_TRUE@lhiptest_uname_LDADD = $(LHIPTEST_COMMON_LIB) \
747+
@LHIP_TESTS_ENABLED_TRUE@ $(top_builddir)/src/lhip_uname.o
748+
720749
@LHIP_TESTS_ENABLED_TRUE@lhiptest_other_SOURCES = lhiptest_other.c $(LHIPTEST_COMMON_SRC)
721750
@LHIP_TESTS_ENABLED_TRUE@lhiptest_other_CFLAGS = $(LHIPTEST_COMMON_CFLAGS)
722751
@LHIP_TESTS_ENABLED_TRUE@lhiptest_other_LDADD = $(LHIPTEST_COMMON_LIB)

‎test/lhiptest_exec.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ extern int fexecve LHIP_PARAMS ((int fd, char *const argv[], char *const envp[])
3838
}
3939
#endif
4040

41-
#define IFCONFIG_DIR "/usr/bin"
41+
#ifndef IFCONFIG_DIR
42+
# define IFCONFIG_DIR "/usr/bin"
43+
#endif
4244

4345
/* ====================== Execution functions */
4446

@@ -191,7 +193,7 @@ START_TEST(test_execveat_banned_empty_path)
191193
}
192194
else
193195
{
194-
ck_abort_msg("test_execveat_banned_empty_path: directory not opened: errno=%d\n", errno);
196+
ck_abort_msg("test_execveat_banned_empty_path: " IFCONFIG_DIR "/ifconfig not opened: errno=%d\n", errno);
195197
}
196198
}
197199
END_TEST
@@ -226,7 +228,7 @@ START_TEST(test_execveat_banned_empty_path_link)
226228
}
227229
else
228230
{
229-
ck_abort_msg("test_execveat_banned_empty_path_link: directory not opened: errno=%d\n", errno);
231+
ck_abort_msg("test_execveat_banned_empty_path_link: " IFCONFIG_DIR "/ifconfig not opened: errno=%d\n", errno);
230232
}
231233
}
232234
END_TEST
@@ -266,7 +268,8 @@ START_TEST(test_fexecve_banned)
266268
{
267269
int a;
268270
char progname[] = "/usr/bin/wget";
269-
char * args[] = { NULL, "https://libhideip.sourceforge.io", NULL };
271+
char domain[] = "https://libhideip.sourceforge.io";
272+
char * args[] = { NULL, NULL, NULL };
270273
char * envp[] = { NULL };
271274
int prog_fd;
272275
int err;
@@ -276,6 +279,7 @@ START_TEST(test_fexecve_banned)
276279
if ( prog_fd >= 0 )
277280
{
278281
args[0] = progname; /* must be set */
282+
args[1] = domain;
279283
a = fexecve (prog_fd, args, envp);
280284
err = errno;
281285
close (prog_fd);

‎test/lhiptest_net.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ START_TEST(test_gethostbyname)
250250
struct hostent * h;
251251

252252
LHIP_PROLOG_FOR_TEST();
253-
h = gethostbyname ("www.google.com");
253+
h = gethostbyname ("libhideip.sourceforge.io");
254254
fail_if(h == NULL);
255255
/*freehostent (h);*/
256256
}
@@ -278,7 +278,7 @@ START_TEST(test_gethostbyname_r)
278278

279279
LHIP_PROLOG_FOR_TEST();
280280
buf[0] = '\0';
281-
a = gethostbyname_r ("www.google.com",
281+
a = gethostbyname_r ("libhideip.sourceforge.io",
282282
&res, buf, sizeof (buf), &tmp, &err);
283283
ck_assert_int_eq(a, 0);
284284
/*freehostent (&res);*/
@@ -308,7 +308,7 @@ START_TEST(test_gethostbyname2)
308308
struct hostent * h;
309309

310310
LHIP_PROLOG_FOR_TEST();
311-
h = gethostbyname2 ("www.google.com", AF_INET);
311+
h = gethostbyname2 ("libhideip.sourceforge.io", AF_INET);
312312
fail_if(h == NULL);
313313
/*freehostent (h);*/
314314
}
@@ -348,7 +348,7 @@ START_TEST(test_gethostbyname2_r)
348348

349349
LHIP_PROLOG_FOR_TEST();
350350
buf[0] = '\0';
351-
a = gethostbyname2_r ("www.google.com", AF_INET,
351+
a = gethostbyname2_r ("libhideip.sourceforge.io", AF_INET,
352352
&res, buf, sizeof (buf), &tmp, &err);
353353
ck_assert_int_eq(a, 0);
354354
/*freehostent (&res);*/
@@ -520,7 +520,7 @@ START_TEST(test_getaddrinfo)
520520
struct addrinfo ai_hints;
521521

522522
LHIP_PROLOG_FOR_TEST();
523-
a = getaddrinfo ("www.google.com", NULL /* service */,
523+
a = getaddrinfo ("libhideip.sourceforge.io", NULL /* service */,
524524
prepare_hints (&ai_hints), &addrinfo_all);
525525
if ( addrinfo_all != NULL )
526526
{

‎test/lhiptest_other.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ START_TEST(test_symb_func)
4646
void * ptr;
4747

4848
LHIP_PROLOG_FOR_TEST();
49-
ptr = dlsym (RTLD_NEXT, "generic_fopen");
49+
ptr = dlsym (RTLD_NEXT, "__lhip_check_hostent_match");
5050
if (ptr != NULL)
5151
{
5252
ck_abort_msg("test_symb_func: symbol found\n");

0 commit comments

Comments
 (0)