sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Makefile for cygwin/mingw build and fix misc warnings 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@145 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2006-02-07 20:56:50 +00:00
parent b8528f4440
commit 6782e09785
17 changed files with 129 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
pjsip/build/Makefile
View File

@ -1,73 +1,113 @@
include make-$(TARGET).inc
include ../../build/common.mak
RULES_MAK := ../../build/rules.mak
PJLIB_LIB:=../../pjlib/lib/libpj-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
export PJSIP_LIB:=../lib/libpjsip-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
export PJSIP_UA_LIB:=../lib/libpjsip-ua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)
###############################################################################
# Gather all flags.
#
export _CFLAGS := -O2 -g $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
$(CFLAGS) $(CC_INC)../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 _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \
$(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \
$(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
$(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
$(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
$(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
$(LDFLAGS)
###############################################################################
# Defines for building PJSIP core library
#
export PJSIP_SRCDIR = ../src/pjsip
export PJSIP_SRCEXT = .c
export PJSIP_SRCS = $(PJSIP_SOURCES) sip_auth.c sip_auth_msg.c sip_auth_parser.c \
sip_endpoint.c sip_misc.c sip_msg.c sip_parser.c \
sip_resolve.c sip_transaction.c sip_transport.c sip_uri.c
export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
sip_errno.o sip_msg.o sip_parser.o sip_tel_uri.o sip_uri.o \
sip_endpoint.o sip_util.o sip_util_proxy.o \
sip_resolve.o sip_transport.o sip_transport_loop.o sip_transport_udp.o \
sip_auth_client.o sip_auth_msg.o sip_auth_parser.o sip_auth_server.o \
sip_transaction.o sip_util_statefull.o \
sip_dialog.o sip_ua_layer.o
export PJSIP_CFLAGS += $(_CFLAGS)
export PJSIP_UA_SRCDIR = ../src/pjsip_mod_ua
export PJSIP_UA_SRCEXT = .c
export PJSIP_UA_SRCS = $(PJSIP_UA_SOURCES) sip_dialog.c sip_reg.c sip_ua.c
###############################################################################
# Defines for building PJSIP UA library
#
export PJSIP_UA_SRCDIR = ../src/pjsip-ua
export PJSIP_UA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
sip_inv.o sip_reg.o
export PJSIP_UA_CFLAGS += $(_CFLAGS)
export PJSIP_SIMPLE_SRCDIR = ../src/pjsip_simple
export PJSIP_SIMPLE_SRCEXT = .c
export PJSIP_SIMPLE_SRCS = $(PJSIP_SIMPLE_SOURCES) event_notify.c event_notify_msg.c \
messaging.c pidf.c presence.c xpidf.c
###############################################################################
# Defines for building PJSUA
#
export PJSUA_SRCDIR = ../src/pjsua
export PJSUA_SRCEXT = .c
export PJSUA_SRCS = $(PJSUA_SOURCES) main.c getopt.c
export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
main.o pjsua_reg.o pjsua.o
export PJSUA_CFLAGS += $(_CFLAGS)
export PJSUA_LDFLAGS += $(_LDFLAGS)
export PJSUA_EXE:=../bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)
export TARGET CCOUT CC AR RANLIB MV RM RMDIR MKDIR OBJEXT LD LDOUT
all: pjsip pjsip_ua pjsip_simple pjsua
export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
###############################################################################
# Main entry
#
#
TARGETS := pjsip pjsip-ua pjsua
all: $(TARGETS)
doc:
cd .. && doxygen docs/doxygen.cfg
print:
$(MAKE) -f make-rules APP=PJSIP app=pjsip print_lib
$(MAKE) -f make-rules APP=PJSIP_UA app=pjsip_ua print_lib
$(MAKE) -f make-rules APP=PJSIP_SIMPLE app=pjsip_simple print_lib
$(MAKE) -f make-rules APP=PJSUA app=pjsua print_bin
depend:
$(MAKE) -f make-rules APP=PJSIP app=pjsip depend
$(MAKE) -f make-rules APP=PJSUA app=pjsua depend
$(MAKE) -f make-rules APP=PJSIP_UA app=pjsip_ua depend
$(MAKE) -f make-rules APP=PJSIP_SIMPLE app=pjsip_simple depend
echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB)' >> .pjsua.depend
dep: depend
pjsip:
$(MAKE) -f make-rules APP=PJSIP app=pjsip $(PJSIP_LIB)
pjsua:
$(MAKE) -f make-rules APP=PJSUA app=pjsua $(PJSUA_EXE)
pjsip_ua:
$(MAKE) -f make-rules APP=PJSIP_UA app=pjsip_ua $(PJSIP_UA_LIB)
pjsip_simple:
$(MAKE) -f make-rules APP=PJSIP_SIMPLE app=pjsip_simple $(PJSIP_SIMPLE_LIB)
samples:
gcc $(_CFLAGS) -o ../bin/simpleua ../src/samples/simpleua.c $(_LDFLAGS)
clean:
$(MAKE) -f make-rules APP=PJSIP app=pjsip clean
$(MAKE) -f make-rules APP=PJSUA app=pjsua clean
$(MAKE) -f make-rules APP=PJSIP_UA app=pjsip_ua clean
$(MAKE) -f make-rules APP=PJSIP_SIMPLE app=pjsip_simple clean
realclean:
$(MAKE) -f make-rules APP=PJSIP app=pjsip realclean
$(MAKE) -f make-rules APP=PJSUA app=pjsua realclean
$(MAKE) -f make-rules APP=PJSIP_UA app=pjsip_ua realclean
$(MAKE) -f make-rules APP=PJSIP_SIMPLE app=pjsip_simple realclean
distclean: realclean
.PHONY: dep depend pjsip pjsip-ua pjsua clean realclean distclean
pjsip:
$(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(PJSIP_LIB)
pjsip-ua:
$(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(PJSIP_UA_LIB)
pjsua: $(PJSIP_LIB) $(PJSIP_UA_LIB)
$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(PJSUA_EXE)
.PHONY: ../lib/pjsip.ko
../lib/pjsip.ko:
echo Making $@
$(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@
.PHONY: ../lib/pjsip-ua.ko
../lib/pjsip-ua.ko:
echo Making $@
$(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@
.PHONY: ../lib/pjsua.ko
../lib/pjsua.ko:
$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
clean depend realclean:
$(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@
$(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@
$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
@if test "$@" == "depend"; then \
echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB)' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \
fi

58
pjsip/build/make-linux-i386.inc
View File

@ -1,58 +0,0 @@
#
# make-linux-i386.inc: Platform specific rules for Linux i386 compile.
#
#
# Include PJLIB settings.
#
include ../../pjlib/build/make-$(TARGET).inc
#
# make-optimize.inc declares PJSIP_OPTIMIZE variable
#
include make-optimize.inc
_CFLAGS := $(_CFLAGS) -I../../pjlib/src -I../../pjmedia/src \
-I../src $(PJSIP_OPTIMIZE)
_LDFLAGS := $(_LDFLAGS) -L../lib -L../../pjlib/lib \
-L../../pjmedia/lib -lpjsip_core -lpjsip_ua -lpjsip_simple \
-lpjmedia -lpj -lpthread
#
# libpjsip_core.a
#
export PJSIP_SOURCES =
export PJSIP_CFLAGS = $(_CFLAGS)
export PJSIP_LIB = ../lib/libpjsip_core.a
export PJSIP_EXTRA_DEP :=
#
# libpjsip_ua.a
#
export PJSIP_UA_SOURCES =
export PJSIP_UA_CFLAGS = $(_CFLAGS)
export PJSIP_UA_LIB = ../lib/libpjsip_ua.a
export PJSIP_UA_EXTRA_DEP :=
#
# libpjsip_simple.a
#
export PJSIP_SIMPLE_SOURCES :=
export PJSIP_SIMPLE_CFLAGS := $(_CFLAGS)
export PJSIP_SIMPLE_LIB := ../lib/libpjsip_simple.a
export PJSIP_SIMPLE_EXTRA_LIB :=
#
# pjsua.exe
#
export PJSUA_SOURCES =
export PJSUA_CFLAGS = $(_CFLAGS)
export PJSUA_LDFLAGS = $(_LDFLAGS)
export PJSUA_EXE = ../bin/pjsua
export PJSUA_EXTRA_DEP := ../lib/libpjsip_core.a ../lib/libpjsip_ua.a \
../lib/libpjsip_simple.a ../../pjlib/lib/libpj.a \
../../pjmedia/lib/libpjmedia.a

56
pjsip/build/make-mingw.inc
View File

@ -1,56 +0,0 @@
#
# Platform specific flags
#
#
# Include PJLIB settings.
#
include ../../pjlib/build/make-$(TARGET).inc
#
# make-optimize.inc declares PJSIP_OPTIMIZE variable
#
include make-optimize.inc
_CFLAGS := $(_CFLAGS) -I../../pjlib/src -I../../pjmedia/src \
$(PJSIP_OPTIMIZE)
_LDFLAGS := -L../../pjlib/lib -L../../pjmedia/lib \
-lpjsip_ua -lpjsip_simple -lpjsip_core -lpjmedia $(_LDFLAGS)
#
# libpjsip_core.a
#
export PJSIP_SOURCES :=
export PJSIP_CFLAGS := $(_CFLAGS)
export PJSIP_LIB := ../lib/libpjsip_core.a
export PJSIP_EXTRA_DEP :=
#
# libpjsip_ua.a
#
export PJSIP_UA_SOURCES :=
export PJSIP_UA_CFLAGS := $(_CFLAGS)
export PJSIP_UA_LIB := ../lib/libpjsip_ua.a
export PJSIP_UA_EXTRA_DEP :=
#
# libpjsip_simple.a
#
export PJSIP_SIMPLE_SOURCES :=
export PJSIP_SIMPLE_CFLAGS := $(_CFLAGS)
export PJSIP_SIMPLE_LIB := ../lib/libpjsip_simple.a
export PJSIP_SIMPLE_EXTRA_LIB :=
#
# pjsua.exe
#
export PJSUA_SOURCES :=
export PJSUA_CFLAGS := $(_CFLAGS)
export PJSUA_LDFLAGS = $(_LDFLAGS)
export PJSUA_EXE = ../bin/pjsua_mingw.exe
export PJSUA_EXTRA_DEP := ../lib/libpjsip_core.a ../lib/libpjsip_ua.a \
../lib/libpjsip_simple.a ../../pjlib/lib/libpj.a \
../../pjmedia/lib/libpjmedia.a

10
pjsip/build/make-optimize.inc
View File

@ -1,10 +0,0 @@
#
# If MINSIZE is defined, optimize for code size.
#
ifdef MINSIZE
PJSIP_OPTIMIZE := $(PJSIP_OPTIMIZE) -DPJSIP_HAS_DUMP=0
else
PJSIP_OPTIMIZE := $(PJSIP_OPTIMIZE)
endif

119
pjsip/build/make-rules
View File

@ -1,119 +0,0 @@
LIBDIR = ../lib
BINDIR = ../bin
#
# The full path of output lib file (e.g. ../lib/libapp.a).
#
LIB = $($(APP)_LIB)
#
# The full path of output executable file (e.g. ../bin/app.exe).
#
EXE = $($(APP)_EXE)
#
# Source directory
#
SRCDIR = $($(APP)_SRCDIR)
#
# SRCEXT is .c
# SRCS is file.c
# FULL_SRCS is ../src/app/file.c
#
SRCEXT = $($(APP)_SRCEXT)
SRCS = $($(APP)_SRCS)
FULL_SRCS = $(foreach file, $(SRCS), $(SRCDIR)/$(file))
#
# Output directory for object files (i.e. output/target)
#
OBJDIR = ./output/$(app)-$(TARGET)
#
# OBJS1 is ./output/target/file.c
# OBJS is ./output/target/file.o
#
OBJS1 = $(foreach file, $(SRCS), $(OBJDIR)/$(file))
OBJS = $(OBJS1:%$(SRCEXT)=%$(OBJEXT))
OBJDIRS := $(sort $(foreach file, $(SRCS), $(dir $(OBJDIR)/$(file))))
#
# When generating dependency (gcc -MM), ideally we use only either
# CFLAGS or CXXFLAGS (not both). But I just couldn't make if/ifeq to work.
#
DEPFLAGS = $($(APP)_CXXFLAGS) $($(APP)_CFLAGS)
print_common:
@echo "###"
@echo "### DUMPING MAKE VARIABLES (I WON'T DO ANYTHING ELSE):"
@echo "###"
@echo APP=$(APP)
@echo SRCEXT=$(SRCEXT)
@echo OBJDIR=$(OBJDIR)
@echo OBJS=$(OBJS)
@echo SRCDIR=$(SRCDIR)
@echo FULL_SRCS=$(FULL_SRCS)
@echo $(APP)_CFLAGS=$($(APP)_CFLAGS)
@echo $(APP)_CXXFLAGS=$($(APP)_CXXFLAGS)
@echo $(APP)_LDFLAGS=$($(APP)_LDFLAGS)
@echo DEPFLAGS=$(DEPFLAGS)
print_bin: print_common
@echo EXE=$(EXE)
@echo BINDIR=$(BINDIR)
print_lib: print_common
@echo LIB=$(LIB)
@echo LIBDIR=$(LIBDIR)
$(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
$(AR) $(LIB) $(OBJS)
$(RANLIB) $(LIB)
$(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
$(LD) $(LDOUT) $(EXE) $(OBJS) $($(APP)_LDFLAGS)
$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
$(CC) $($(APP)_CFLAGS) $< $(CCOUT) $@
$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
$(CC) $($(APP)_CXXFLAGS) $< $(CCOUT) $@
#$(OBJDIR):
# $(MKDIR) $(OBJDIR)
$(OBJDIRS):
$(MKDIR) $@
$(LIBDIR):
$(MKDIR) $(LIBDIR)
$(BINDIR):
$(MKDIR) $(BINDIR)
clean:
$(RM) -r $(OBJDIR)/*
$(RMDIR) $(OBJDIR)
realclean: clean
$(RM) $(LIB) $(EXE)
$(RM) .$(app).depend
depend:
$(RM) .$(app).depend
for F in $(FULL_SRCS); do \
echo -n $(OBJDIR)/ >> .$(app).depend; \
if gcc -MM $(DEPFLAGS) $$F >> .$(app).depend; then \
true; \
else \
echo 'err:' >> .$(app).depend; \
exit 1; \
fi; \
done
dep: depend
-include .$(app).depend

4
pjsip/include/pjsip/sip_msg.h
View File

@ -72,12 +72,12 @@ typedef enum pjsip_method_e
* member will always contain a valid method string regardless whether the ID
* is recognized or not.
*/
typedef struct pjsip_method
struct pjsip_method
{
pjsip_method_e id; /**< Method ID, from \a pjsip_method_e. */
pj_str_t name; /**< Method name, which will always contain the
method string. */
} pjsip_method;
};
/*

4
pjsip/include/pjsip/sip_transport.h
View File

@ -466,7 +466,7 @@ PJ_DECL(char*) pjsip_tx_data_get_info( pjsip_tx_data *tdata );
* Applications normally extend this structure to include transport
* specific members.
*/
typedef struct pjsip_transport
struct pjsip_transport
{
char obj_name[PJ_MAX_OBJ_NAME]; /**< Name. */
@ -537,7 +537,7 @@ typedef struct pjsip_transport
/*
* Application may extend this structure..
*/
} pjsip_transport;
};
/**

2
pjsip/src/pjsip-ua/sip_inv.c
View File

@ -846,7 +846,7 @@ PJ_DEF(pj_status_t) pjsip_inv_answer( pjsip_inv_session *inv,
/* Include SDP for 18x and 2xx response. */
if (st_code/10 == 18 || st_code/10 == 20) {
pjmedia_sdp_session *local;
const pjmedia_sdp_session *local;
status = pjmedia_sdp_neg_get_neg_local(inv->neg, &local);
if (status == PJ_SUCCESS)

4
pjsip/src/pjsip/sip_endpoint.c
View File

@ -122,9 +122,9 @@ static void pool_callback( pj_pool_t *pool, pj_size_t size )
/* Compare module name, used for searching module based on name. */
static int cmp_mod_name(void *name, const pjsip_module *mod)
static int cmp_mod_name(void *name, const void *mod)
{
return pj_stricmp(name, &mod->name);
return pj_stricmp(name, &((pjsip_module*)mod)->name);
}
/*

4
pjsip/src/pjsip/sip_msg.c
View File

@ -1716,8 +1716,8 @@ PJ_DEF(pjsip_warning_hdr*) pjsip_warning_hdr_create( pj_pool_t *pool,
host->slen + 2 + /* host */
text->slen + 2); /* text */
hvalue.slen = pj_sprintf(hvalue.ptr, "%u %.*s \"%.*s\"",
code, host->slen, host->ptr,
text->slen, text->ptr);
code, (int)host->slen, host->ptr,
(int)text->slen, text->ptr);
return pjsip_generic_string_hdr_create(pool, &str_warning, &hvalue);
}

12
pjsip/src/pjsip/sip_parser.c
View File

@ -154,7 +154,7 @@ static void int_parse_uri_host_port( pj_scanner *scanner,
static pjsip_uri * int_parse_uri_or_name_addr( pj_scanner *scanner,
pj_pool_t *pool,
unsigned option);
static pjsip_sip_uri* int_parse_sip_url( pj_scanner *scanner,
static void* int_parse_sip_url( pj_scanner *scanner,
pj_pool_t *pool,
pj_bool_t parse_params);
static pjsip_name_addr *
@ -1149,10 +1149,12 @@ static pjsip_uri *int_parse_uri(pj_scanner *scanner, pj_pool_t *pool,
}
}
/* Parse "sip:" and "sips:" URI. */
static pjsip_sip_uri *int_parse_sip_url( pj_scanner *scanner,
pj_pool_t *pool,
pj_bool_t parse_params)
/* Parse "sip:" and "sips:" URI.
* This actually returns (pjsip_sip_uri*) type,
*/
static void* int_parse_sip_url( pj_scanner *scanner,
pj_pool_t *pool,
pj_bool_t parse_params)
{
pj_str_t scheme;
pjsip_sip_uri *url = NULL;

10
pjsip/src/pjsip/sip_tel_uri.c
View File

@ -70,7 +70,7 @@ static pj_ssize_t tel_uri_print( pjsip_uri_context_e context,
static int tel_uri_cmp( pjsip_uri_context_e context,
const pjsip_tel_uri *url1, const pjsip_tel_uri *url2);
static pjsip_tel_uri* tel_uri_clone(pj_pool_t *pool, const pjsip_tel_uri *rhs);
static pjsip_tel_uri *tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
static void* tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
pj_bool_t parse_params);
#ifdef __GNUC__
@ -350,9 +350,11 @@ static pjsip_tel_uri* tel_uri_clone(pj_pool_t *pool, const pjsip_tel_uri *rhs)
return uri;
}
/* Parse tel: URI */
static pjsip_tel_uri *tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
pj_bool_t parse_params)
/* Parse tel: URI
* THis actually returns (pjsip_tel_uri *) type.
*/
static void* tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
pj_bool_t parse_params)
{
pjsip_tel_uri *uri;
pj_str_t token;

6
pjsip/src/pjsip/sip_transaction.c
View File

@ -44,7 +44,7 @@
** Declarations and static variable definitions section.
**
*****************************************************************************
**/
/* Prototypes. */
static pj_status_t mod_tsx_layer_load(pjsip_endpoint *endpt);
static pj_status_t mod_tsx_layer_start(void);
@ -408,7 +408,7 @@ PJ_DEF(pj_status_t) pjsip_tsx_create_key( pj_pool_t *pool, pj_str_t *key,
** Transaction layer module
**
*****************************************************************************
**/
/*
* Create transaction layer module and registers it to the endpoint.
*/
@ -770,7 +770,7 @@ PJ_DEF(pjsip_transaction*) pjsip_rdata_get_tsx( pjsip_rx_data *rdata )
** Transaction
**
*****************************************************************************
**/
/*
* Lock transaction and set the value of Thread Local Storage.
*/

8
pjsip/src/pjsip/sip_transport.c
View File

@ -320,14 +320,14 @@ static char *get_msg_info(pj_pool_t *pool, const char *obj_name,
if (msg->type == PJSIP_REQUEST_MSG) {
len = pj_snprintf(info_buf, sizeof(info_buf),
"Request msg %.*s/cseq=%d (%s)",
msg->line.req.method.name.slen,
(int)msg->line.req.method.name.slen,
msg->line.req.method.name.ptr,
cseq->cseq, obj_name);
} else {
len = pj_snprintf(info_buf, sizeof(info_buf),
"Response msg %d/%.*s/cseq=%d (%s)",
msg->line.status.code,
cseq->method.name.slen,
(int)cseq->method.name.slen,
cseq->method.name.ptr,
cseq->cseq, obj_name);
}
@ -444,7 +444,7 @@ static pj_status_t mod_on_tx_msg(pjsip_tx_data *tdata)
*/
PJ_DEF(pj_status_t) pjsip_transport_send( pjsip_transport *tr,
pjsip_tx_data *tdata,
const pj_sockaddr *addr,
const pj_sockaddr_t *addr,
int addr_len,
void *token,
void (*cb)(void *token,
@ -465,7 +465,7 @@ PJ_DEF(pj_status_t) pjsip_transport_send( pjsip_transport *tr,
tdata->tp_info.transport = tr;
pj_memcpy(&tdata->tp_info.dst_addr, addr, addr_len);
tdata->tp_info.dst_addr_len = addr_len;
if (addr->sa_family == PJ_AF_INET) {
if (((pj_sockaddr*)addr)->sa_family == PJ_AF_INET) {
const char *str_addr;
str_addr = pj_inet_ntoa(((pj_sockaddr_in*)addr)->sin_addr);
pj_native_strcpy(tdata->tp_info.dst_name, str_addr);

2
pjsip/src/pjsip/sip_ua_layer.c
View File

@ -624,7 +624,7 @@ static pj_bool_t mod_ua_on_rx_response(pjsip_rx_data *rdata)
// rdata->msg_info.cseq->cseq == dlg_set->dlg_list.next->local.first_cseq)
if (rdata->msg_info.cseq->method.id == PJSIP_INVITE_METHOD) {
pj_str_t *to_tag = &rdata->msg_info.to->tag;
//pj_str_t *to_tag = &rdata->msg_info.to->tag;
/* Must hold UA mutex before accessing dialog set. */
pj_mutex_lock(mod_ua.mutex);

2
pjsip/src/pjsua/pjsua.c
View File

@ -18,10 +18,10 @@
*/
#include "pjsua.h"
struct pjsua pjsua;
#define THIS_FILE "pjsua.c"
struct pjsua_t pjsua;
#define PJSUA_LOCAL_URI "<sip:user@127.0.0.1>"

2
pjsip/src/pjsua/pjsua.h
View File

@ -36,7 +36,7 @@
/* PJSUA application variables. */
extern struct pjsua
extern struct pjsua_t
{
/* Control: */