[svn-commits] rmudgett: branch rmudgett/dahdi_facility r225031 - in /team/rmudgett/dahdi_fa...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Oct 21 09:31:38 CDT 2009
Author: rmudgett
Date: Wed Oct 21 09:31:18 2009
New Revision: 225031
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=225031
Log:
Merged revisions 224930,224932,225003 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r224930 | rmudgett | 2009-10-20 21:43:36 -0500 (Tue, 20 Oct 2009) | 1 line
Make PRI_SUBCMD_xxx handling subaddress friendly.
................
r224932 | russell | 2009-10-20 22:09:04 -0500 (Tue, 20 Oct 2009) | 12 lines
Merged revisions 224931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r224931 | russell | 2009-10-20 21:59:54 -0500 (Tue, 20 Oct 2009) | 5 lines
Isolate frames returned from a DSP instance or codec translator.
The reasoning for these changes are the same as what I wrote in the commit
message for rev 222878.
........
................
r225003 | file | 2009-10-21 08:34:49 -0500 (Wed, 21 Oct 2009) | 7 lines
Add support for specifying the IP address to use for media streams in sip.conf
(closes issue #14729)
Reported by: _brent_
Patches:
media_address.patch uploaded by brent (license 388)
................
Modified:
team/rmudgett/dahdi_facility/ (props changed)
team/rmudgett/dahdi_facility/CHANGES
team/rmudgett/dahdi_facility/channels/chan_sip.c
team/rmudgett/dahdi_facility/codecs/codec_dahdi.c
team/rmudgett/dahdi_facility/configs/sip.conf.sample
team/rmudgett/dahdi_facility/include/asterisk/dsp.h
team/rmudgett/dahdi_facility/include/asterisk/frame.h
team/rmudgett/dahdi_facility/include/asterisk/translate.h
team/rmudgett/dahdi_facility/main/dsp.c
team/rmudgett/dahdi_facility/main/frame.c
team/rmudgett/dahdi_facility/main/translate.c
Propchange: team/rmudgett/dahdi_facility/
------------------------------------------------------------------------------
automerge = *
Propchange: team/rmudgett/dahdi_facility/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/rmudgett/dahdi_facility/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct 21 09:31:18 2009
@@ -1,1 +1,1 @@
-/trunk:1-224922
+/trunk:1-225030
Modified: team/rmudgett/dahdi_facility/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/CHANGES?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/CHANGES (original)
+++ team/rmudgett/dahdi_facility/CHANGES Wed Oct 21 09:31:18 2009
@@ -66,6 +66,8 @@
configuration for the externip and externhost options when tcp or tls is used.
* Added support for message body (stored in content variable) to SIP NOTIFY message
accessible via AMI and CLI.
+ * Added 'media_address' configuration option which can be used to explicitly specify
+ the IP address to use in the SDP for media (audio and video) streams.
IAX2 Changes
-----------
Modified: team/rmudgett/dahdi_facility/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/channels/chan_sip.c?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/channels/chan_sip.c (original)
+++ team/rmudgett/dahdi_facility/channels/chan_sip.c Wed Oct 21 09:31:18 2009
@@ -2329,6 +2329,7 @@
* to support the above functions.
*/
static struct sockaddr_in externip; /*!< External IP address if we are behind NAT */
+static struct sockaddr_in media_address; /*!< External RTP IP address if we are behind NAT */
static char externhost[MAXHOSTNAMELEN]; /*!< External host name */
static time_t externexpire; /*!< Expiration counter for re-resolving external host name in dynamic DNS */
@@ -10154,7 +10155,7 @@
dest->sin_port = p->redirip.sin_port;
dest->sin_addr = p->redirip.sin_addr;
} else {
- dest->sin_addr = p->ourip.sin_addr;
+ dest->sin_addr = media_address.sin_addr.s_addr ? media_address.sin_addr : p->ourip.sin_addr;
dest->sin_port = sin->sin_port;
}
if (needvideo) {
@@ -10163,7 +10164,7 @@
vdest->sin_addr = p->vredirip.sin_addr;
vdest->sin_port = p->vredirip.sin_port;
} else {
- vdest->sin_addr = p->ourip.sin_addr;
+ vdest->sin_addr = media_address.sin_addr.s_addr ? media_address.sin_addr : p->ourip.sin_addr;
vdest->sin_port = vsin->sin_port;
}
}
@@ -24951,6 +24952,7 @@
ast_free_ha(localaddr);
memset(&localaddr, 0, sizeof(localaddr));
memset(&externip, 0, sizeof(externip));
+ memset(&media_address, 0, sizeof(media_address));
memset(&default_prefs, 0 , sizeof(default_prefs));
memset(&sip_cfg.outboundproxy, 0, sizeof(struct sip_proxy));
sip_cfg.outboundproxy.ip.sin_port = htons(STANDARD_SIP_PORT);
@@ -25320,6 +25322,9 @@
localaddr = na;
if (ha_error)
ast_log(LOG_ERROR, "Bad localnet configuration value line %d : %s\n", v->lineno, v->value);
+ } else if (!strcasecmp(v->name, "media_address")) {
+ if (ast_parse_arg(v->value, PARSE_INADDR, &media_address))
+ ast_log(LOG_WARNING, "Invalid address for media_address keyword: %s\n", v->value);
} else if (!strcasecmp(v->name, "externip")) {
if (ast_parse_arg(v->value, PARSE_INADDR, &externip))
ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);
Modified: team/rmudgett/dahdi_facility/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/codecs/codec_dahdi.c?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/codecs/codec_dahdi.c (original)
+++ team/rmudgett/dahdi_facility/codecs/codec_dahdi.c Wed Oct 21 09:31:18 2009
@@ -235,10 +235,9 @@
pvt->f.offset = 0;
pvt->f.datalen = 0;
pvt->f.mallocd = 0;
- ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
- return &pvt->f;
+ return ast_frisolate(&pvt->f);
} else if (1 == dahdip->fake) {
dahdip->fake = 0;
@@ -263,11 +262,10 @@
pvt->f.offset = AST_FRIENDLY_OFFSET;
pvt->f.src = pvt->t->name;
pvt->f.data.ptr = pvt->outbuf.c;
- ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
pvt->datalen = 0;
- return &pvt->f;
+ return ast_frisolate(&pvt->f);
}
/* Shouldn't get here... */
@@ -310,9 +308,8 @@
pvt->f.offset = 0;
pvt->f.datalen = 0;
pvt->f.mallocd = 0;
- ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
- return &pvt->f;
+ return ast_frisolate(&pvt->f);
} else if (1 == dahdip->fake) {
pvt->samples = 0;
dahdip->fake = 0;
@@ -349,10 +346,9 @@
pvt->f.src = pvt->t->name;
pvt->f.data.ptr = pvt->outbuf.c;
pvt->f.samples = dahdip->required_samples;
- ast_set_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR);
pvt->samples = 0;
- return &pvt->f;
+ return ast_frisolate(&pvt->f);
}
/* Shouldn't get here... */
Modified: team/rmudgett/dahdi_facility/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/configs/sip.conf.sample?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/configs/sip.conf.sample (original)
+++ team/rmudgett/dahdi_facility/configs/sip.conf.sample Wed Oct 21 09:31:18 2009
@@ -695,6 +695,12 @@
; nat = force_rport ; Force rport to always be on.
; nat = yes ; Force rport to always be on and perform symmetric RTP.
; nat = comedia ; Use rport if the remote side says to use it and perform symmetric RTP.
+;
+; The IP address used for media (audio and video) in the SDP can also be overridden by using
+; the media_address configuration option. This is only applicable to the general section and
+; can not be set per-user or per-peer.
+;
+; media_address = 172.16.42.1
;----------------------------------- MEDIA HANDLING --------------------------------
; By default, Asterisk tries to re-invite media streams to an optimal path. If there's
Modified: team/rmudgett/dahdi_facility/include/asterisk/dsp.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/include/asterisk/dsp.h?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/include/asterisk/dsp.h (original)
+++ team/rmudgett/dahdi_facility/include/asterisk/dsp.h Wed Oct 21 09:31:18 2009
@@ -157,16 +157,4 @@
*/
int ast_dsp_init(void);
-/*!
- * \brief Hint that a frame from a dsp was freed
- *
- * This is called from ast_frame_free if AST_FRFLAG_FROM_DSP is set. This occurs
- * because it is possible for the dsp to be freed while someone still holds a reference
- * to the frame that is in that dsp. This has been known to happen when the dsp on a DAHDI
- * channel detects a busy signal. The channel is hung up, and the application that read the
- * frame to begin with still has a reference to the frame.
- *
- * \return nothing
- */
-void ast_dsp_frame_freed(struct ast_frame *fr);
#endif /* _ASTERISK_DSP_H */
Modified: team/rmudgett/dahdi_facility/include/asterisk/frame.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/include/asterisk/frame.h?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/include/asterisk/frame.h (original)
+++ team/rmudgett/dahdi_facility/include/asterisk/frame.h Wed Oct 21 09:31:18 2009
@@ -128,14 +128,6 @@
enum {
/*! This frame contains valid timing information */
AST_FRFLAG_HAS_TIMING_INFO = (1 << 0),
- /*! This frame came from a translator and is still the original frame.
- * The translator can not be free'd if the frame inside of it still has
- * this flag set. */
- AST_FRFLAG_FROM_TRANSLATOR = (1 << 1),
- /*! This frame came from a dsp and is still the original frame.
- * The dsp cannot be free'd if the frame inside of it still has
- * this flag set. */
- AST_FRFLAG_FROM_DSP = (1 << 2),
};
/*! \brief Data structure associated with a single frame of data
Modified: team/rmudgett/dahdi_facility/include/asterisk/translate.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/include/asterisk/translate.h?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/include/asterisk/translate.h (original)
+++ team/rmudgett/dahdi_facility/include/asterisk/translate.h Wed Oct 21 09:31:18 2009
@@ -151,7 +151,6 @@
struct ast_trans_pvt *next; /*!< next in translator chain */
struct timeval nextin;
struct timeval nextout;
- unsigned int destroy:1;
};
/*! \brief generic frameout function */
@@ -257,20 +256,6 @@
*/
unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src);
-/*!
- * \brief Hint that a frame from a translator has been freed
- *
- * This is sort of a hack. This function gets called when ast_frame_free() gets
- * called on a frame that has the AST_FRFLAG_FROM_TRANSLATOR flag set. This is
- * because it is possible for a translation path to be destroyed while a frame
- * from a translator is still in use. Specifically, this happens if a masquerade
- * happens after a call to ast_read() but before the frame is done being processed,
- * since the frame processing is generally done without the channel lock held.
- *
- * \return nothing
- */
-void ast_translate_frame_freed(struct ast_frame *fr);
-
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
Modified: team/rmudgett/dahdi_facility/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/main/dsp.c?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/main/dsp.c (original)
+++ team/rmudgett/dahdi_facility/main/dsp.c Wed Oct 21 09:31:18 2009
@@ -391,7 +391,6 @@
digit_detect_state_t digit_state;
tone_detect_state_t cng_tone_state;
tone_detect_state_t ced_tone_state;
- int destroy;
};
static void mute_fragment(struct ast_dsp *dsp, fragment_t *fragment)
@@ -1350,8 +1349,7 @@
memset(&dsp->f, 0, sizeof(dsp->f));
dsp->f.frametype = AST_FRAME_NULL;
ast_frfree(af);
- ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
- return &dsp->f;
+ return ast_frisolate(&dsp->f);
}
if ((dsp->features & DSP_FEATURE_BUSY_DETECT) && ast_dsp_busydetect(dsp)) {
chan->_softhangup |= AST_SOFTHANGUP_DEV;
@@ -1360,8 +1358,7 @@
dsp->f.subclass = AST_CONTROL_BUSY;
ast_frfree(af);
ast_debug(1, "Requesting Hangup because the busy tone was detected on channel %s\n", chan->name);
- ast_set_flag(&dsp->f, AST_FRFLAG_FROM_DSP);
- return &dsp->f;
+ return ast_frisolate(&dsp->f);
}
if ((dsp->features & DSP_FEATURE_FAX_DETECT)) {
@@ -1471,8 +1468,7 @@
ast_queue_frame(chan, af);
}
ast_frfree(af);
- ast_set_flag(outf, AST_FRFLAG_FROM_DSP);
- return outf;
+ return ast_frisolate(outf);
} else {
return af;
}
@@ -1522,16 +1518,6 @@
void ast_dsp_free(struct ast_dsp *dsp)
{
- if (ast_test_flag(&dsp->f, AST_FRFLAG_FROM_DSP)) {
- /* If this flag is still set, that means that the dsp's destruction
- * been torn down, while we still have a frame out there being used.
- * When ast_frfree() gets called on that frame, this ast_trans_pvt
- * will get destroyed, too. */
-
- dsp->destroy = 1;
-
- return;
- }
ast_free(dsp);
}
@@ -1697,16 +1683,3 @@
return _dsp_init(1);
}
-void ast_dsp_frame_freed(struct ast_frame *fr)
-{
- struct ast_dsp *dsp;
-
- ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
-
- dsp = (struct ast_dsp *) (((char *) fr) - offsetof(struct ast_dsp, f));
-
- if (!dsp->destroy)
- return;
-
- ast_dsp_free(dsp);
-}
Modified: team/rmudgett/dahdi_facility/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/main/frame.c?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/main/frame.c (original)
+++ team/rmudgett/dahdi_facility/main/frame.c Wed Oct 21 09:31:18 2009
@@ -332,12 +332,6 @@
static void __frame_free(struct ast_frame *fr, int cache)
{
- if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR)) {
- ast_translate_frame_freed(fr);
- } else if (ast_test_flag(fr, AST_FRFLAG_FROM_DSP)) {
- ast_dsp_frame_freed(fr);
- }
-
if (!fr->mallocd)
return;
@@ -422,8 +416,6 @@
out->seqno = fr->seqno;
}
} else {
- ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
- ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
out = fr;
}
Modified: team/rmudgett/dahdi_facility/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/dahdi_facility/main/translate.c?view=diff&rev=225031&r1=225030&r2=225031
==============================================================================
--- team/rmudgett/dahdi_facility/main/translate.c (original)
+++ team/rmudgett/dahdi_facility/main/translate.c Wed Oct 21 09:31:18 2009
@@ -134,17 +134,6 @@
{
struct ast_translator *t = pvt->t;
- if (ast_test_flag(&pvt->f, AST_FRFLAG_FROM_TRANSLATOR)) {
- /* If this flag is still set, that means that the translation path has
- * been torn down, while we still have a frame out there being used.
- * When ast_frfree() gets called on that frame, this ast_trans_pvt
- * will get destroyed, too. */
-
- pvt->destroy = 1;
-
- return;
- }
-
if (t->destroy)
t->destroy(pvt);
ast_free(pvt);
@@ -238,9 +227,7 @@
f->src = pvt->t->name;
f->data.ptr = pvt->outbuf.c;
- ast_set_flag(f, AST_FRFLAG_FROM_TRANSLATOR);
-
- return f;
+ return ast_frisolate(f);
}
static struct ast_frame *default_frameout(struct ast_trans_pvt *pvt)
@@ -905,17 +892,3 @@
return res;
}
-
-void ast_translate_frame_freed(struct ast_frame *fr)
-{
- struct ast_trans_pvt *pvt;
-
- ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
-
- pvt = (struct ast_trans_pvt *) (((char *) fr) - offsetof(struct ast_trans_pvt, f));
-
- if (!pvt->destroy)
- return;
-
- destroy(pvt);
-}
More information about the svn-commits
mailing list