[svn-commits] rmudgett: branch 1.8 r343637 - /branches/1.8/channels/chan_sip.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Nov 7 15:13:25 CST 2011
Author: rmudgett
Date: Mon Nov 7 15:13:21 2011
New Revision: 343637
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=343637
Log:
Fix __sip_subscribe_mwi_do() incorectly changing dialogs hash key callid.
Changing an object value used as a container key requires removing the
object from the container and reinserting it.
* Created change_callid_pvt() to call instead of build_callid_pvt(). The
change_callid_pvt() will correctly change the dialog callid so the ao2
conainter can explicitly unlink it.
Modified:
branches/1.8/channels/chan_sip.c
Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=343637&r1=343636&r2=343637
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Mon Nov 7 15:13:21 2011
@@ -1502,6 +1502,7 @@
static int create_addr(struct sip_pvt *dialog, const char *opeer, struct ast_sockaddr *addr, int newdialog, struct ast_sockaddr *remote_address);
static char *generate_random_string(char *buf, size_t size);
static void build_callid_pvt(struct sip_pvt *pvt);
+static void change_callid_pvt(struct sip_pvt *pvt, const char *callid);
static void build_callid_registry(struct sip_registry *reg, const struct ast_sockaddr *ourip, const char *fromdomain);
static void make_our_tag(char *tagbuf, size_t len);
static int add_header(struct sip_request *req, const char *var, const char *value);
@@ -5303,15 +5304,20 @@
if (!ast_strlen_zero(peer->fromdomain)) {
ast_string_field_set(dialog, fromdomain, peer->fromdomain);
if (!dialog->initreq.headers) {
- char *c;
+ char *new_callid;
char *tmpcall = ast_strdupa(dialog->callid);
/* this sure looks to me like we are going to change the callid on this dialog!! */
- c = strchr(tmpcall, '@');
- if (c) {
- *c = '\0';
- ao2_t_unlink(dialogs, dialog, "About to change the callid -- remove the old name");
- ast_string_field_build(dialog, callid, "%s@%s", tmpcall, peer->fromdomain);
- ao2_t_link(dialogs, dialog, "New dialog callid -- inserted back into table");
+ new_callid = strchr(tmpcall, '@');
+ if (new_callid) {
+ int callid_size;
+
+ *new_callid = '\0';
+
+ /* Change the dialog callid. */
+ callid_size = strlen(tmpcall) + strlen(peer->fromdomain) + 2;
+ new_callid = alloca(callid_size);
+ snprintf(new_callid, callid_size, "%s@%s", tmpcall, peer->fromdomain);
+ change_callid_pvt(dialog, new_callid);
}
}
}
@@ -7444,15 +7450,60 @@
return buf;
}
-/*! \brief Build SIP Call-ID value for a non-REGISTER transaction */
+/*!
+ * \brief Build SIP Call-ID value for a non-REGISTER transaction
+ *
+ * \note The passed in pvt must not be in a dialogs container
+ * since this function changes the hash key used by the
+ * container.
+ */
static void build_callid_pvt(struct sip_pvt *pvt)
{
char buf[33];
-
const char *host = S_OR(pvt->fromdomain, ast_sockaddr_stringify_remote(&pvt->ourip));
-
+
ast_string_field_build(pvt, callid, "%s@%s", generate_random_string(buf, sizeof(buf)), host);
-
+}
+
+/*! \brief Unlink the given object from the container and return TRUE if it was in the container. */
+#define CONTAINER_UNLINK(container, obj, tag) \
+ ({ \
+ int found = 0; \
+ typeof((obj)) __removed_obj; \
+ __removed_obj = ao2_t_callback((container), \
+ OBJ_UNLINK | OBJ_POINTER, ao2_match_by_addr, (obj), (tag)); \
+ if (__removed_obj) { \
+ ao2_ref(__removed_obj, -1); \
+ found = 1; \
+ } \
+ found; \
+ })
+
+/*!
+ * \internal
+ * \brief Safely change the callid of the given SIP dialog.
+ *
+ * \param pvt SIP private structure to change callid
+ * \param callid Specified new callid to use. NULL if generate new callid.
+ *
+ * \return Nothing
+ */
+static void change_callid_pvt(struct sip_pvt *pvt, const char *callid)
+{
+ int in_dialog_container;
+
+ ao2_lock(dialogs);
+ in_dialog_container = CONTAINER_UNLINK(dialogs, pvt,
+ "About to change the callid -- remove the old name");
+ if (callid) {
+ ast_string_field_set(pvt, callid, callid);
+ } else {
+ build_callid_pvt(pvt);
+ }
+ if (in_dialog_container) {
+ ao2_t_link(dialogs, pvt, "New dialog callid -- inserted back into table");
+ }
+ ao2_unlock(dialogs);
}
/*! \brief Build SIP Call-ID value for a REGISTER transaction */
@@ -12161,7 +12212,10 @@
ast_sip_ouraddrfor(&mwi->call->sa, &mwi->call->ourip, mwi->call);
build_contact(mwi->call);
build_via(mwi->call);
- build_callid_pvt(mwi->call);
+
+ /* Change the dialog callid. */
+ change_callid_pvt(mwi->call, NULL);
+
ast_set_flag(&mwi->call->flags[0], SIP_OUTGOING);
/* Associate the call with us */
@@ -25200,8 +25254,6 @@
/* Recalculate our side, and recalculate Call ID */
ast_sip_ouraddrfor(&p->sa, &p->ourip, p);
build_via(p);
- ao2_t_unlink(dialogs, p, "About to change the callid -- remove the old name");
- build_callid_pvt(p);
ao2_lock(peer);
if (!ast_strlen_zero(peer->mwi_from)) {
@@ -25211,7 +25263,9 @@
}
ao2_unlock(peer);
- ao2_t_link(dialogs, p, "Linking in under new name");
+ /* Change the dialog callid. */
+ change_callid_pvt(p, NULL);
+
/* Destroy this session after 32 secs */
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
}
@@ -25827,9 +25881,9 @@
/* Recalculate our side, and recalculate Call ID */
ast_sip_ouraddrfor(&p->sa, &p->ourip, p);
build_via(p);
- ao2_t_unlink(dialogs, p, "About to change the callid -- remove the old name");
- build_callid_pvt(p);
- ao2_t_link(dialogs, p, "Linking in under new name");
+
+ /* Change the dialog callid. */
+ change_callid_pvt(p, NULL);
AST_SCHED_DEL_UNREF(sched, peer->pokeexpire,
unref_peer(peer, "removing poke peer ref"));
@@ -26125,10 +26179,10 @@
/* Recalculate our side, and recalculate Call ID */
ast_sip_ouraddrfor(&p->sa, &p->ourip, p);
build_via(p);
- ao2_t_unlink(dialogs, p, "About to change the callid -- remove the old name");
- build_callid_pvt(p);
- ao2_t_link(dialogs, p, "Linking in under new name");
-
+
+ /* Change the dialog callid. */
+ change_callid_pvt(p, NULL);
+
/* We have an extension to call, don't use the full contact here */
/* This to enable dialing registered peers with extension dialling,
like SIP/peername/extension
More information about the svn-commits
mailing list