pjproject: remove redefinitions from rules.mak

This also solves calls via TURN. In fact the redefinition in
rules.mak leads to a difference between the internal offsets
in pjproject and the daemon. So, structures passed to pjsip are
incorrect.

Change-Id: I50261781511b11cffd9441e825d8edb09256f3e0
Gitlab: #105

contrib/src/pjproject/rules.mak

@@ -24,9 +24,6 @@ PJPROJECT_OPTIONS := --disable-oss          \
                      --disable-libwebrtc    \
                      --with-gnutls=$(PREFIX)
 
-PJPROJECT_EXTRA_CFLAGS = -g -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32 -DPJ_HAS_TCP=1
-PJPROJECT_EXTRA_CXXFLAGS = -g -DPJ_ENABLE_EXTRA_CHECK=1 -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=1024 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -DPJ_ICE_ST_MAX_CAND=32 -DPJ_HAS_TCP=1
-
 ifdef HAVE_WIN64
 PJPROJECT_EXTRA_CFLAGS += -DPJ_WIN64=1
 endif
@@ -67,6 +64,7 @@ endif
 	$(APPLY) $(SRC)/pjproject/rfc6062.patch
 	$(APPLY) $(SRC)/pjproject/rfc6544.patch
 	$(APPLY) $(SRC)/pjproject/ice_config.patch
+	$(APPLY) $(SRC)/pjproject/sip_config.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
@@ -76,5 +74,5 @@ ifdef HAVE_IOS
 else
 	cd $< && $(HOSTVARS) EXCLUDE_APP=1 ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS)
 endif
-	cd $< && CFLAGS="$(PJPROJECT_EXTRA_CFLAGS)" CXXFLAGS="$(PJPROJECT_EXTRA_CXXFLAGS)" EXCLUDE_APP=1 $(MAKE) && $(MAKE) install
+	cd $< && EXCLUDE_APP=1 $(MAKE) && $(MAKE) install
 	touch $@

contrib/src/pjproject/sip_config.patch

+ pjsip/include/pjsip/sip_config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h
+index 904df24e..987ff41d 100644
+--- a/pjsip/include/pjsip/sip_config.h
++++ b/pjsip/include/pjsip/sip_config.h
+@@ -359,7 +359,7 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
+  * containing presence information can be quite large (>1500).
+  */
+ #ifndef PJSIP_MAX_PKT_LEN
+-#   define PJSIP_MAX_PKT_LEN		4000
++#   define PJSIP_MAX_PKT_LEN		8000
+ #endif