diff options
Diffstat (limited to 'pjsip-apps')
-rw-r--r-- | pjsip-apps/build/Footprint.mak | 37 | ||||
-rw-r--r-- | pjsip-apps/build/Samples.mak | 4 | ||||
-rw-r--r-- | pjsip-apps/build/get-footprint.py | 9 | ||||
-rw-r--r-- | pjsip-apps/src/samples/footprint.c | 72 |
4 files changed, 84 insertions, 38 deletions
diff --git a/pjsip-apps/build/Footprint.mak b/pjsip-apps/build/Footprint.mak index 9510d54b..cc63179d 100644 --- a/pjsip-apps/build/Footprint.mak +++ b/pjsip-apps/build/Footprint.mak @@ -2,49 +2,22 @@ # This file is used by get-footprint.py script to build samples/footprint.c # to get the footprint report for PJSIP/PJMEDIA. # +include ../../build.mak include ../../build/common.mak -PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) -PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) -PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) -PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) -PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT) -PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) -PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) -PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT) - ############################################################################### # Gather all flags. # -export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ - $(CFLAGS) $(CC_INC)../../pjsip/include \ - $(CC_INC)../../pjlib/include \ - $(CC_INC)../../pjlib-util/include \ - $(CC_INC)../../pjmedia/include -export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ - $(HOST_CXXFLAGS) $(CXXFLAGS) - -export LIBS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) - - -export _LDFLAGS := $(LIBS) \ - $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ - $(LDFLAGS) -lm - +export _CFLAGS := $(APP_CFLAGS) $(CFLAGS) +export _CXXFLAGS:= $(_CFLAGS) +export _LDFLAGS := $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS) EXE := footprint.exe all: - $(CROSS_COMPILE)$(CC_NAME) -o $(EXE) ../src/samples/footprint.c $(FCFLAGS) $(_CFLAGS) $(_LDFLAGS) + $(APP_CC) -o $(EXE) ../src/samples/footprint.c $(FCFLAGS) $(_CFLAGS) $(_LDFLAGS) $(CROSS_COMPILE)strip --strip-all $(EXE) clean: diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak index edc69d17..bf0b451c 100644 --- a/pjsip-apps/build/Samples.mak +++ b/pjsip-apps/build/Samples.mak @@ -5,9 +5,9 @@ include ../../build/common.mak ############################################################################### # Gather all flags. # -export _CFLAGS := $(PJ_CFLAGS) +export _CFLAGS := $(PJ_CFLAGS) $(CFLAGS) export _CXXFLAGS:= $(PJ_CXXFLAGS) -export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) +export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) SRCDIR := ../src/samples OBJDIR := ./output/samples-$(TARGET_NAME) diff --git a/pjsip-apps/build/get-footprint.py b/pjsip-apps/build/get-footprint.py index c20c8978..cb6f6868 100644 --- a/pjsip-apps/build/get-footprint.py +++ b/pjsip-apps/build/get-footprint.py @@ -44,6 +44,9 @@ compile_flags = [ ['HAS_PJLIB_XML', 'PJLIB-UTIL tiny XML (parsing and API) (needs text scanner)'], ['HAS_PJLIB_DNS', 'PJLIB-UTIL DNS packet and parsing'], ['HAS_PJLIB_RESOLVER', 'PJLIB-UTIL Asynchronous DNS resolver/caching engine'], + ['HAS_PJLIB_CRC32', 'PJLIB-UTIL CRC32 algorithm'], + ['HAS_PJLIB_HMAC_MD5', 'PJLIB-UTIL HMAC-MD5 algorithm'], + ['HAS_PJLIB_HMAC_SHA1', 'PJLIB-UTIL HMAC-SHA1 algorithm'], # PJSIP ['HAS_PJSIP_CORE_MSG_ELEM', 'PJSIP Core - Messaging Elements and Parsing (message, headers, SIP URI, TEL URI/RFC 3966, etc.)'], @@ -53,6 +56,7 @@ compile_flags = [ ['', 'Subtotal: A minimalistic SIP application (parsing, UDP transport+STUN, no transaction)'], ['HAS_PJSIP_TCP_TRANSPORT', 'PJSIP TCP transport'], + ['HAS_PJSIP_TLS_TRANSPORT', 'PJSIP TLS transport'], ['HAS_PJSIP_INFO', 'PJSIP INFO support (RFC 2976) (no special treatment, thus the zero size)'], ['HAS_PJSIP_TRANSACTION', 'PJSIP transaction and stateful API'], ['HAS_PJSIP_AUTH_CLIENT', 'PJSIP digest authentication client'], @@ -75,6 +79,10 @@ compile_flags = [ # Subtotal ['', 'Subtotal: Complete PJSIP package (call, registration, presence, IM) +STUN +GETOPT (+PJLIB), no media'], + # PJNATH + ['HAS_PJNATH_STUN', 'PJNATH STUN'], + ['HAS_PJNATH_ICE', 'PJNATH ICE'], + # PJMEDIA ['HAS_PJMEDIA_EC', 'PJMEDIA accoustic echo cancellation'], ['HAS_PJMEDIA_SND_DEV', 'PJMEDIA sound device backend (platform specific)'], @@ -96,6 +104,7 @@ compile_flags = [ ['HAS_PJMEDIA_FILE_CAPTURE', 'PJMEDIA WAV file writer'], ['HAS_PJMEDIA_MEM_PLAYER', 'PJMEDIA fixed buffer player'], ['HAS_PJMEDIA_MEM_CAPTURE', 'PJMEDIA fixed buffer writer'], + ['HAS_PJMEDIA_ICE', 'PJMEDIA ICE transport'], # Subtotal ['', 'Subtotal: Complete SIP and all PJMEDIA features (G.711 codec only)'], diff --git a/pjsip-apps/src/samples/footprint.c b/pjsip-apps/src/samples/footprint.c index 4912a224..b45a717b 100644 --- a/pjsip-apps/src/samples/footprint.c +++ b/pjsip-apps/src/samples/footprint.c @@ -32,6 +32,7 @@ #include <pjmedia-codec.h> #include <pjlib-util.h> #include <pjlib.h> +#include <pjnath.h> #include <stdlib.h> /* All flags: */ @@ -44,6 +45,11 @@ #define HAS_PJLIB_SCANNER #define HAS_PJLIB_DNS #define HAS_PJLIB_RESOLVER +#define HAS_PJLIB_SRV_RESOLVER + +#define HAS_PJLIB_CRC32 +#define HAS_PJLIB_HMAC_MD5 +#define HAS_PJLIB_HMAC_SHA1 #define HAS_PJSIP_CORE_MSG_ELEM #define HAS_PJSIP_CORE @@ -51,6 +57,7 @@ #define HAS_PJSIP_UDP_TRANSPORT #define HAS_PJSIP_TCP_TRANSPORT +#define HAS_PJSIP_TLS_TRANSPORT #define HAS_PJSIP_TRANSACTION #define HAS_PJSIP_UA_LAYER #define HAS_PJMEDIA_SDP @@ -63,6 +70,9 @@ #define HAS_PJSIP_PRESENCE #define HAS_PJSIP_IS_COMPOSING +#define HAS_PJNATH_STUN +#define HAS_PJNATH_ICE + #define HAS_PJMEDIA #define HAS_PJMEDIA_SND_DEV #define HAS_PJMEDIA_EC @@ -82,6 +92,7 @@ #define HAS_PJMEDIA_FILE_CAPTURE #define HAS_PJMEDIA_MEM_PLAYER #define HAS_PJMEDIA_MEM_CAPTURE +#define HAS_PJMEDIA_ICE #define HAS_PJMEDIA_G711_CODEC #define HAS_PJMEDIA_GSM_CODEC @@ -112,7 +123,7 @@ int dummy_function() #endif #ifdef HAS_PJLIB_STUN - pj_stun_get_mapped_addr(&cp.factory, 0, NULL, NULL, 80, NULL, 80, NULL); + pjstun_get_mapped_addr(&cp.factory, 0, NULL, NULL, 80, NULL, 80, NULL); #endif #ifdef HAS_PJLIB_GETOPT @@ -161,7 +172,7 @@ int dummy_function() #ifdef HAS_PJLIB_DNS pj_dns_make_query(NULL, NULL, 0, 0, NULL); pj_dns_parse_packet(NULL, NULL, 0, NULL); - pj_dns_packet_dup(NULL, NULL, NULL); + pj_dns_packet_dup(NULL, NULL, 0, NULL); #endif #ifdef HAS_PJLIB_RESOLVER @@ -174,6 +185,45 @@ int dummy_function() pj_dns_resolver_add_entry(NULL, NULL, 0); #endif +#ifdef HAS_PJLIB_SRV_RESOLVER + pj_dns_srv_resolve(NULL, NULL, 0, NULL, NULL, PJ_FALSE, NULL, NULL); +#endif + +#ifdef HAS_PJLIB_CRC32 + pj_crc32_init(NULL); + pj_crc32_update(NULL, NULL, 0); + pj_crc32_final(NULL); +#endif + +#ifdef HAS_PJLIB_HMAC_MD5 + pj_hmac_md5(NULL, 0, NULL, 0, NULL); +#endif + +#ifdef HAS_PJLIB_HMAC_SHA1 + pj_hmac_sha1(NULL, 0, NULL, 0, NULL); +#endif + +#ifdef HAS_PJNATH_STUN + pj_stun_session_create(NULL, NULL, NULL, PJ_FALSE, NULL); + pj_stun_session_destroy(NULL); + pj_stun_session_set_credential(NULL, NULL); + pj_stun_session_create_req(NULL, 0, NULL, NULL); + pj_stun_session_create_ind(NULL, 0, NULL); + pj_stun_session_create_res(NULL, NULL, 0, NULL, NULL); + pj_stun_session_send_msg(NULL, PJ_FALSE, NULL, 0, NULL); +#endif + +#ifdef HAS_PJNATH_ICE + pj_ice_strans_create(NULL, NULL, 0, NULL, NULL, NULL); + pj_ice_strans_set_stun_domain(NULL, NULL, NULL); + pj_ice_strans_create_comp(NULL, 0, 0, NULL); + pj_ice_strans_add_cand(NULL, 0, PJ_ICE_CAND_TYPE_HOST, 0, NULL, PJ_FALSE); + pj_ice_strans_init_ice(NULL, PJ_ICE_SESS_ROLE_CONTROLLED, NULL, NULL); + pj_ice_strans_start_ice(NULL, NULL, NULL, 0, NULL); + pj_ice_strans_stop_ice(NULL); + pj_ice_strans_sendto(NULL, 0, NULL, 0, NULL, 0); +#endif + #ifdef HAS_PJSIP_CORE_MSG_ELEM /* Parameter container */ pjsip_param_find(NULL, NULL); @@ -232,7 +282,7 @@ int dummy_function() pjsip_endpt_create_response(NULL, NULL, -1, NULL, NULL); pjsip_endpt_create_ack(NULL, NULL, NULL, NULL); pjsip_endpt_create_cancel(NULL, NULL, NULL); - pjsip_get_request_addr(NULL, NULL); + pjsip_get_request_dest(NULL, NULL); pjsip_endpt_send_request_stateless(NULL, NULL, NULL, NULL); pjsip_get_response_addr(NULL, NULL, NULL); pjsip_endpt_send_response(NULL, NULL, NULL, NULL, NULL); @@ -247,6 +297,10 @@ int dummy_function() pjsip_tcp_transport_start(NULL, NULL, 1, NULL); #endif +#ifdef HAS_PJSIP_TLS_TRANSPORT + pjsip_tls_transport_start(NULL, NULL, NULL, NULL, 0, NULL); +#endif + #ifdef HAS_PJSIP_TRANSACTION pjsip_tsx_layer_init_module(NULL); @@ -429,7 +483,7 @@ int dummy_function() #endif #ifdef HAS_PJMEDIA_RESAMPLE - pjmedia_resample_create(NULL, PJ_TRUE, PJ_TRUE, 0, 0, 0, NULL); + pjmedia_resample_create(NULL, PJ_TRUE, PJ_TRUE, 0, 0, 0, 0, NULL); pjmedia_resample_run(NULL, NULL, NULL); #endif @@ -549,6 +603,16 @@ int dummy_function() pjmedia_mem_capture_create(NULL, NULL, 1000, 8000, 1, 80, 16, 0, NULL); #endif +#ifdef HAS_PJMEDIA_ICE + pjmedia_ice_create(NULL, NULL, 0, NULL, NULL); + pjmedia_ice_destroy(NULL); + pjmedia_ice_start_init(NULL, 0, NULL, NULL, NULL); + pjmedia_ice_init_ice(NULL, PJ_ICE_SESS_ROLE_CONTROLLED, NULL, NULL); + pjmedia_ice_modify_sdp(NULL, NULL, NULL); + pjmedia_ice_start_ice(NULL, NULL, NULL, 0); + pjmedia_ice_stop_ice(NULL); +#endif + #ifdef HAS_PJMEDIA_G711_CODEC pjmedia_codec_g711_init(NULL); pjmedia_codec_g711_deinit(); |