[asterisk-commits] oej: branch oej/codename-pineapple r47605 - in /team/oej/codename-pineapple/c...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Nov 14 09:20:13 2006
New Revision: 47605

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47605
Log:
Various fixes

Modified:
    team/oej/codename-pineapple/channels/Makefile
    team/oej/codename-pineapple/channels/chan_sip3.c
    team/oej/codename-pineapple/channels/sip3/sip3_network.c
    team/oej/codename-pineapple/channels/sip3/sip3funcs.h

Modified: team/oej/codename-pineapple/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/Makefile?view=diff&rev=47605&r1=47604&r2=47605
==============================================================================
--- team/oej/codename-pineapple/channels/Makefile (original)
+++ team/oej/codename-pineapple/channels/Makefile Tue Nov 14 09:20:13 2006
@@ -121,6 +121,8 @@
 sip3:	
 	$(MAKE) -C sip3 
 
-chan_sip3.so: $(SIP3_MODULES) sip3/sip3.h  sip3/sip3funcs.h
-	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(SOLINK) -o $@ $< 
+#chan_sip3.so: $(SIP3_MODULES) sip3/sip3.h  sip3/sip3funcs.h
+#$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+#$(CMD_PREFIX) $(CXX) $(SOLINK) -o $@ $< 
+
+$(if $(filter chan_sip3,$(EMBEDDED_MODS)),modules.link,chan_sip3.so): $(SIP3_MODULES)

Modified: team/oej/codename-pineapple/channels/chan_sip3.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/chan_sip3.c?view=diff&rev=47605&r1=47604&r2=47605
==============================================================================
--- team/oej/codename-pineapple/channels/chan_sip3.c (original)
+++ team/oej/codename-pineapple/channels/chan_sip3.c Tue Nov 14 09:20:13 2006
@@ -520,7 +520,7 @@
 	a SIP dialog
 */
 GNURK void sip_dump_history(struct sip_dialog *dialog);	/* Dump history to LOG_DEBUG at end of dialog, before destroying data */
-static inline int sip_debug_test_pvt(struct sip_dialog *p);
+GNURK inline int sip_debug_test_pvt(struct sip_dialog *p);
 
 /*--- Device object handling */
 static struct sip_peer *temp_peer(const char *name);
@@ -606,14 +606,6 @@
 	parse_request(&dialog->initreq);
 	if (ast_test_flag(req, SIP_PKT_DEBUG))
 		ast_verbose("Initreq: %d headers, %d lines\n", dialog->initreq.headers, dialog->initreq.lines);
-}
-
-/*! \brief Test PVT for debugging output */
-inline int sip_debug_test_pvt(struct sip_dialog *dialog) 
-{
-	if (!sipdebug)
-		return 0;
-	return sip_debug_test_addr(sip_real_dst(dialog));
 }
 
 /*! \brief Find via branch parameter */

Modified: team/oej/codename-pineapple/channels/sip3/sip3_network.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/sip3/sip3_network.c?view=diff&rev=47605&r1=47604&r2=47605
==============================================================================
--- team/oej/codename-pineapple/channels/sip3/sip3_network.c (original)
+++ team/oej/codename-pineapple/channels/sip3/sip3_network.c Tue Nov 14 09:20:13 2006
@@ -503,6 +503,7 @@
 	return ast_test_flag(&p->flags[0], SIP_NAT) & SIP_NAT_ROUTE ? &p->recv : &p->sa;
 }
 
+
 /*! \brief See if we pass debug IP filter */
 inline int sip_debug_test_addr(const struct sockaddr_in *addr) 
 {
@@ -517,6 +518,14 @@
 	return 1;
 }
 
+/*! \brief Test PVT for debugging output */
+inline int sip_debug_test_pvt(struct sip_dialog *p)
+{
+	if (!sipdebug)
+		return 0;
+	return sip_debug_test_addr(sip_real_dst(p));
+}
+
 /*! \brief NAT fix - decide which IP address to use for ASterisk server?
  *
  * Using the localaddr structure built up with localnet statements in sip.conf

Modified: team/oej/codename-pineapple/channels/sip3/sip3funcs.h
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/sip3/sip3funcs.h?view=diff&rev=47605&r1=47604&r2=47605
==============================================================================
--- team/oej/codename-pineapple/channels/sip3/sip3funcs.h (original)
+++ team/oej/codename-pineapple/channels/sip3/sip3funcs.h Tue Nov 14 09:20:13 2006
@@ -56,7 +56,6 @@
 GNURK void reg_source_db(struct sip_peer *peer);
 GNURK int expire_register(void *data);
 GNURK int sip_do_relaod(enum channelreloadreason reason);
-GNURK inline int sip_debug_test_addr(const struct sockaddr_in *addr);
 GNURK void parse_request(struct sip_request *req);
 GNURK int transmit_response(struct sip_dialog *p, const char *msg, const struct sip_request *req);
 GNURK void parse_copy(struct sip_request *dst, const struct sip_request *src);
@@ -105,7 +104,8 @@
 GNURK int send_response(struct sip_dialog *p, struct sip_request *req, enum xmittype reliable, int seqno);
 GNURK int send_request(struct sip_dialog *p, struct sip_request *req, enum xmittype reliable, int seqno);
 GNURK const struct sockaddr_in *sip_real_dst(const struct sip_dialog *p);
-GNURK inline int sip_debug_test_pvt(struct sip_dialog *p) ;
+GNURK inline int sip_debug_test_pvt(struct sip_dialog *p);
+GNURK inline int sip_debug_test_addr(const struct sockaddr_in *addr);
 GNURK int sip_ouraddrfor(struct in_addr *them, struct in_addr *us);
 
 /*! sip3_parse.c */