diff options
| author | Matt O'Gorman <mogorman@digium.com> | 2006-08-08 17:07:41 +0000 |
|---|---|---|
| committer | Matt O'Gorman <mogorman@digium.com> | 2006-08-08 17:07:41 +0000 |
| commit | 1ef09ebfed21bcf157922b083c1497020575ba6f (patch) | |
| tree | d834fe7337842a6d3e592217134ea2a2df3e937c /channels | |
| parent | a0bd41f79b67beadf8c8bbe3afeefff6d0bbcc31 (diff) | |
some code clean up and catch for a act_hook being called
without a packet.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_jingle.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 58e4a5d90..9bf77cc27 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -168,7 +168,7 @@ AST_MUTEX_DEFINE_STATIC(usecnt_lock); static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263; -AST_MUTEX_DEFINE_STATIC(jinglelock); /*!< Protect the interface list (of sip_pvt's) */ +AST_MUTEX_DEFINE_STATIC(jinglelock); /*!< Protect the interface list (of jingle_pvt's) */ /* Forward declarations */ static struct ast_channel *jingle_request(const char *type, int format, void *data, int *cause); @@ -448,7 +448,7 @@ static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, st static int jingle_response(struct jingle *client, ikspak *pak, const char *reasonstr, const char *reasonstr2) { - iks *response, *error = NULL, *reason; + iks *response = NULL, *error = NULL, *reason = NULL; int res = -1; response = iks_new("iq"); @@ -1238,8 +1238,8 @@ static int jingle_sendhtml(struct ast_channel *ast, int subclass, const char *da } static int jingle_transmit_invite(struct jingle_pvt *p) { - struct jingle *jingle; - struct aji_client *client; + struct jingle *jingle = NULL; + struct aji_client *client = NULL; iks *iq, *desc, *session; iks *payload_eg711u, *payload_pcmu; @@ -1577,7 +1577,8 @@ static int jingle_load_config(void) ast_copy_string(context, var->value, sizeof(context)); else if (!strcasecmp(var->name, "externip")) ast_copy_string(externip, var->value, sizeof(externip)); -#if 0 +/* Idea to allow for custom candidates */ +/* else if (!strcasecmp(var->name, "candidate")) { candidate = jingle_create_candidate(var->value); if (candidate) { @@ -1585,7 +1586,7 @@ static int jingle_load_config(void) global_candidates = candidate; } } -#endif +*/ } while (cat) { if (strcasecmp(cat, "general")) { @@ -1610,7 +1611,8 @@ static int jingle_load_config(void) else if (!strcasecmp(var->name, "context")) ast_copy_string(member->context, var->value, sizeof(member->context)); -#if 0 +/* Idea to allow for custom candidates */ +/* else if (!strcasecmp(var->name, "candidate")) { candidate = jingle_create_candidate(var->value); if (candidate) { @@ -1618,7 +1620,7 @@ static int jingle_load_config(void) member->ourcandidates = candidate; } } -#endif +*/ var = var->next; } ASTOBJ_UNLOCK(member); |