kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the ability to specify an OSP token for an outbound IAX2 call.

Browse Source 
When this patch was originally submitted, the code allowed for the token to be
set via a channel variable.  I decided that a cleaner approach would be to
integrate it into the CHANNEL() function.  Unfortunately, that is not a suitable
approach.  It's not possible to get the value set on the channel soon enough
using that method.  So, go back to the simple channel variable method.

(closes issue #16711)
Reported by: homesick
Patches:
      iax-svn.diff uploaded by homesick (license 91)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@243482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2010-01-27 17:32:07 +00:00
parent 7662c7fed2
commit 34317fb0d3
2 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
channels/chan_iax2.c
View File

@@ -1189,7 +1189,6 @@ static void prune_users(void);
static void iax2_free_variable_datastore(void *);
static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *preparse, char *buf, size_t buflen);
static int acf_channel_write(struct ast_channel *chan, const char *function, char *data, const char *value);
static int decode_frame(ast_aes_decrypt_key *dcx, struct ast_iax2_full_hdr *fh, struct ast_frame *f, int *datalen);
static int encrypt_frame(ast_aes_encrypt_key *ecx, struct ast_iax2_full_hdr *fh, unsigned char *poo, int *datalen);
static void build_ecx_key(const unsigned char *digest, struct chan_iax2_pvt *pvt);
@@ -1222,7 +1221,6 @@ static const struct ast_channel_tech iax2_tech = {
.transfer = iax2_transfer,
.fixup = iax2_fixup,
.func_channel_read = acf_channel_read,
.func_channel_write = acf_channel_write,
};
static void mwi_event_cb(const struct ast_event *event, void *userdata)
@@ -4990,8 +4988,8 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
iaxs[callno]->initid = iax2_sched_add(sched, autokill * 2, auto_congest, CALLNO_TO_PTR(callno));
}
/* Check if there is an OSP token set by IAXCHANINFO function */
osp_token_ptr = iaxs[callno]->osptoken;
/* Check if there is an OSP token */
osp_token_ptr = pbx_builtin_getvar_helper(c, "IAX2OSPTOKEN");
if (!ast_strlen_zero(osp_token_ptr)) {
if ((osp_token_length = strlen(osp_token_ptr)) <= IAX_MAX_OSPTOKEN_SIZE) {
osp_block_index = 0;
@@ -13548,34 +13546,6 @@ static struct ast_custom_function iaxpeer_function = {
.read = function_iaxpeer,
};
static int acf_channel_write(struct ast_channel *chan, const char *function, char *args, const char *value)
{
struct chan_iax2_pvt *pvt;
unsigned int callno;
int res = 0;
if (!chan || chan->tech != &iax2_tech) {
ast_log(LOG_ERROR, "This function requires a valid IAX2 channel\n");
return -1;
}
callno = PTR_TO_CALLNO(chan->tech_pvt);
ast_mutex_lock(&iaxsl[callno]);
if (!(pvt = iaxs[callno])) {
ast_mutex_unlock(&iaxsl[callno]);
return -1;
}
if (!strcasecmp(args, "osptoken"))
ast_string_field_set(pvt, osptoken, value);
else
res = -1;
ast_mutex_unlock(&iaxsl[callno]);
return res;
}
static int acf_channel_read(struct ast_channel *chan, const char *funcname, char *args, char *buf, size_t buflen)
{
struct chan_iax2_pvt *pvt;

3
funcs/func_channel.c
View File

@@ -204,9 +204,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</enumlist>
<para><emphasis>chan_iax2</emphasis> provides the following additional options:</para>
<enumlist>
<enum name="osptoken">
<para>R/W Get or set the OSP token information for a call.</para>
</enum>
<enum name="peerip">
<para>R/O Get the peer's ip address.</para>
</enum>