mirror of
https://github.com/wangyu-/udp2raw.git
synced 2025-02-07 23:59:36 +08:00
Merge branch 'portable' of https://github.com/wangyu-/udp2raw-tunnel into portable
This commit is contained in:
commit
955093d26e
7
main.cpp
7
main.cpp
@ -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");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
4
makefile
4
makefile
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user