Merge branch 'portable' of https://github.com/wangyu-/udp2raw-tunnel into portable

This commit is contained in:
U-DESKTOP-T772REH\wangyu 2018-06-20 21:07:02 +08:00
commit 955093d26e
2 changed files with 9 additions and 2 deletions

View File

@ -829,9 +829,12 @@ int client_event_loop()
if(cnt==0) log_bare(log_warn," [no ip found]"); if(cnt==0) log_bare(log_warn," [no ip found]");
if(d->description==0) if(d->description==0)
{ {
log_bare(log_warn,"; (null)"); log_bare(log_warn,"; (no description avaliable)");
}
else
{
log_bare(log_warn,"; %s", d->description);
} }
log_bare(log_warn,"; %s", d->description);
log_bare(log_warn,"\n"); log_bare(log_warn,"\n");
} }

View File

@ -61,6 +61,10 @@ mac_nolibnet:git_version
rm -f ${NAME} rm -f ${NAME}
${cc_local} -o ${NAME} -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2 -DNO_LIBNET ${cc_local} -o ${NAME} -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2 -DNO_LIBNET
mac_nolibnet_static:git_version #it doesnt work
rm -f ${NAME}
${cc_local} -o ${NAME} -I. ${SOURCES} -static-libstdc++ /usr/local/Cellar/libpcap/1.8.1/lib/libpcap.a ${FLAGS} -ggdb -O2 -DNO_LIBNET
fast: git_version fast: git_version
rm -f ${NAME} rm -f ${NAME}
${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb ${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb