mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 20:08:17 +00:00
Compare commits
13 Commits
certified/
...
1.8.1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
ec5f786d22 | ||
|
|
99a9d772c5 | ||
|
|
8a70ea1e99 | ||
|
|
4f5a866659 | ||
|
|
d38b12ff37 | ||
|
|
0419fd4d8d | ||
|
|
7be24ff6e9 | ||
|
|
627effd7eb | ||
|
|
81a26a26ba | ||
|
|
3e48412423 | ||
|
|
f3c57f2ec9 | ||
|
|
63a9e41ba9 | ||
|
|
cc21b98590 |
3
.lastclean
Normal file
3
.lastclean
Normal file
@@ -0,0 +1,3 @@
|
||||
38
|
||||
|
||||
|
||||
63
asterisk-1.8.1.2-summary.html
Normal file
63
asterisk-1.8.1.2-summary.html
Normal file
@@ -0,0 +1,63 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.8.1.2</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">asterisk-1.8.1.2</h3>
|
||||
<h3 align="center">Date: 2011-01-17</h3>
|
||||
<h3 align="center"><asteriskteam@digium.com></h3>
|
||||
<hr/>
|
||||
<h2 align="center">Table of Contents</h2>
|
||||
<ol>
|
||||
<li><a href="#summary">Summary</a></li>
|
||||
<li><a href="#contributors">Contributors</a></li>
|
||||
<li><a href="#commits">Other Changes</a></li>
|
||||
<li><a href="#diffstat">Diffstat</a></li>
|
||||
</ol>
|
||||
<hr/>
|
||||
<a name="summary"><h2 align="center">Summary</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This release has been made to address one or more security vulnerabilities that have been identified. A security advisory document has been published for each vulnerability that includes additional information. Users of versions of Asterisk that are affected are strongly encouraged to review the advisories and determine what action they should take to protect their systems from these issues.</p>
|
||||
<p>Security Advisories: <a href="http://downloads.asterisk.org/pub/security/AST-2011-001.html">AST-2011-001</a></p>
|
||||
<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.8.1.1.</p>
|
||||
<hr/>
|
||||
<a name="contributors"><h2 align="center">Contributors</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
|
||||
<table width="100%" border="0">
|
||||
<tr>
|
||||
<td width="33%"><h3>Coders</h3></td>
|
||||
<td width="33%"><h3>Testers</h3></td>
|
||||
<td width="33%"><h3>Reporters</h3></td>
|
||||
</tr>
|
||||
<tr valign="top">
|
||||
<td>
|
||||
2 lmadsen<br/>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<hr/>
|
||||
<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p>
|
||||
<table width="100%" border="1">
|
||||
<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.8.1.2?view=revision&revision=302103">302103</a></td><td>lmadsen</td><td>Create 1.8.1.2 from 1.8.1.1</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.8.1.2?view=revision&revision=302149">302149</a></td><td>lmadsen</td><td>AST-2011-001</td>
|
||||
<td></td></tr></table>
|
||||
<hr/>
|
||||
<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
|
||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
|
||||
<pre>
|
||||
.version | 2
|
||||
ChangeLog | 6
|
||||
asterisk-1.8.1-summary.html | 760 -------------------------------
|
||||
asterisk-1.8.1-summary.txt | 1018 ------------------------------------------
|
||||
asterisk-1.8.1.1-summary.html | 59 --
|
||||
asterisk-1.8.1.1-summary.txt | 90 ---
|
||||
main/utils.c | 21
|
||||
7 files changed, 17 insertions(+), 1939 deletions(-)
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
91
asterisk-1.8.1.2-summary.txt
Normal file
91
asterisk-1.8.1.2-summary.txt
Normal file
@@ -0,0 +1,91 @@
|
||||
Release Summary
|
||||
|
||||
asterisk-1.8.1.2
|
||||
|
||||
Date: 2011-01-17
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. Summary
|
||||
2. Contributors
|
||||
3. Other Changes
|
||||
4. Diffstat
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Summary
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This release has been made to address one or more security vulnerabilities
|
||||
that have been identified. A security advisory document has been published
|
||||
for each vulnerability that includes additional information. Users of
|
||||
versions of Asterisk that are affected are strongly encouraged to review
|
||||
the advisories and determine what action they should take to protect their
|
||||
systems from these issues.
|
||||
|
||||
Security Advisories: AST-2011-001
|
||||
|
||||
The data in this summary reflects changes that have been made since the
|
||||
previous release, asterisk-1.8.1.1.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Contributors
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This table lists the people who have submitted code, those that have
|
||||
tested patches, as well as those that reported issues on the issue tracker
|
||||
that were resolved in this release. For coders, the number is how many of
|
||||
their patches (of any size) were committed into this release. For testers,
|
||||
the number is the number of times their name was listed as assisting with
|
||||
testing a patch. Finally, for reporters, the number is the number of
|
||||
issues that they reported that were closed by commits that went into this
|
||||
release.
|
||||
|
||||
Coders Testers Reporters
|
||||
2 lmadsen
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Commits Not Associated with an Issue
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a list of all changes that went into this release that did not
|
||||
directly close an issue from the issue tracker. The commits may have been
|
||||
marked as being related to an issue. If that is the case, the issue
|
||||
numbers are listed here, as well.
|
||||
|
||||
+------------------------------------------------------------------------+
|
||||
| Revision | Author | Summary | Issues Referenced |
|
||||
|-----------+----------+-----------------------------+-------------------|
|
||||
| 302103 | lmadsen | Create 1.8.1.2 from 1.8.1.1 | |
|
||||
|-----------+----------+-----------------------------+-------------------|
|
||||
| 302149 | lmadsen | AST-2011-001 | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Diffstat Results
|
||||
|
||||
[Back to Top]
|
||||
|
||||
This is a summary of the changes to the source code that went into this
|
||||
release that was generated using the diffstat utility.
|
||||
|
||||
.version | 2
|
||||
ChangeLog | 6
|
||||
asterisk-1.8.1-summary.html | 760 -------------------------------
|
||||
asterisk-1.8.1-summary.txt | 1018 ------------------------------------------
|
||||
asterisk-1.8.1.1-summary.html | 59 --
|
||||
asterisk-1.8.1.1-summary.txt | 90 ---
|
||||
main/utils.c | 21
|
||||
7 files changed, 17 insertions(+), 1939 deletions(-)
|
||||
|
||||
----------------------------------------------------------------------
|
||||
@@ -193,6 +193,8 @@ static int gtalk_update_stun(struct gtalk *client, struct gtalk_pvt *p);
|
||||
/* static char *gtalk_do_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a); */
|
||||
static char *gtalk_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
|
||||
static int gtalk_update_externip(void);
|
||||
static int gtalk_parser(void *data, ikspak *pak);
|
||||
static int gtalk_create_candidates(struct gtalk *client, struct gtalk_pvt *p, char *sid, char *from, char *to);
|
||||
|
||||
/*! \brief PBX interface structure for channel registration */
|
||||
static const struct ast_channel_tech gtalk_tech = {
|
||||
@@ -458,12 +460,46 @@ static int gtalk_invite(struct gtalk_pvt *p, char *to, char *from, char *sid, in
|
||||
static int gtalk_ringing_ack(void *data, ikspak *pak)
|
||||
{
|
||||
struct gtalk_pvt *p = data;
|
||||
struct ast_channel *owner;
|
||||
|
||||
if (p->ringrule)
|
||||
ast_mutex_lock(&p->lock);
|
||||
|
||||
if (p->ringrule) {
|
||||
iks_filter_remove_rule(p->parent->connection->f, p->ringrule);
|
||||
}
|
||||
p->ringrule = NULL;
|
||||
if (p->owner)
|
||||
ast_queue_control(p->owner, AST_CONTROL_RINGING);
|
||||
|
||||
/* this may be a redirect */
|
||||
if (!strcmp(S_OR(iks_find_attrib(pak->x, "type"), ""), "error")) {
|
||||
char *name = NULL;
|
||||
char *redirect = NULL;
|
||||
iks *traversenodes = NULL;
|
||||
traversenodes = pak->query;
|
||||
while (traversenodes) {
|
||||
if (!(name = iks_name(traversenodes))) {
|
||||
break;
|
||||
}
|
||||
if (!strcasecmp(name, "error") &&
|
||||
(redirect = iks_find_cdata(traversenodes, "redirect")) &&
|
||||
(redirect = strstr(redirect, "xmpp:"))) {
|
||||
redirect += 5;
|
||||
ast_log(LOG_DEBUG, "redirect %s\n", redirect);
|
||||
ast_copy_string(p->them, redirect, sizeof(p->them));
|
||||
|
||||
gtalk_invite(p, p->them, p->us, p->sid, 1);
|
||||
break;
|
||||
}
|
||||
traversenodes = iks_next_tag(traversenodes);
|
||||
}
|
||||
}
|
||||
gtalk_create_candidates(p->parent, p, p->sid, p->them, p->us);
|
||||
owner = p->owner;
|
||||
ast_mutex_unlock(&p->lock);
|
||||
|
||||
if (owner) {
|
||||
ast_queue_control(owner, AST_CONTROL_RINGING);
|
||||
}
|
||||
|
||||
return IKS_FILTER_EAT;
|
||||
}
|
||||
|
||||
@@ -965,7 +1001,7 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const
|
||||
if (resources) {
|
||||
snprintf(idroster, sizeof(idroster), "%s/%s", them, resources->resource);
|
||||
} else if ((*them == '+') || (strstr(them, "@voice.google.com"))) {
|
||||
snprintf(idroster, sizeof(idroster), "%s/srvres", them);
|
||||
snprintf(idroster, sizeof(idroster), "%s", them);
|
||||
} else {
|
||||
ast_log(LOG_ERROR, "no gtalk capable clients to talk to.\n");
|
||||
return NULL;
|
||||
@@ -1775,7 +1811,6 @@ static int gtalk_call(struct ast_channel *ast, char *dest, int timeout)
|
||||
}
|
||||
|
||||
gtalk_invite(p, p->them, p->us, p->sid, 1);
|
||||
gtalk_create_candidates(p->parent, p, p->sid, p->them, p->us);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -3091,6 +3091,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
|
||||
int hasfeatures=0;
|
||||
int hadfeatures=0;
|
||||
int autoloopflag;
|
||||
int we_disabled_peer_cdr = 0;
|
||||
struct ast_option_header *aoh;
|
||||
struct ast_cdr *bridge_cdr = NULL;
|
||||
struct ast_cdr *orig_peer_cdr = NULL;
|
||||
@@ -3158,9 +3159,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
|
||||
ast_cdr_appenduserfield(chan, tmp);
|
||||
} else
|
||||
ast_cdr_setuserfield(chan, peer->cdr->userfield);
|
||||
/* free the peer's cdr without ast_cdr_free complaining */
|
||||
ast_free(peer->cdr);
|
||||
peer->cdr = NULL;
|
||||
/* Don't delete the CDR; just disable it. */
|
||||
ast_set_flag(peer->cdr, AST_CDR_FLAG_POST_DISABLED);
|
||||
we_disabled_peer_cdr = 1;
|
||||
}
|
||||
ast_copy_string(orig_channame,chan->name,sizeof(orig_channame));
|
||||
ast_copy_string(orig_peername,peer->name,sizeof(orig_peername));
|
||||
@@ -3600,6 +3601,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
|
||||
ast_cdr_specialized_reset(new_peer_cdr, 0);
|
||||
}
|
||||
} else {
|
||||
if (we_disabled_peer_cdr) {
|
||||
ast_clear_flag(peer->cdr, AST_CDR_FLAG_POST_DISABLED);
|
||||
}
|
||||
ast_cdr_specialized_reset(peer->cdr, 0); /* nothing changed, reset the peer cdr */
|
||||
}
|
||||
}
|
||||
|
||||
21
main/utils.c
21
main/utils.c
@@ -383,33 +383,32 @@ static void base64_init(void)
|
||||
char *ast_uri_encode(const char *string, char *outbuf, int buflen, int do_special_char)
|
||||
{
|
||||
const char *ptr = string; /* Start with the string */
|
||||
char *out = NULL;
|
||||
char *buf = NULL;
|
||||
char *out = outbuf;
|
||||
const char *mark = "-_.!~*'()"; /* no encode set, RFC 2396 section 2.3, RFC 3261 sec 25 */
|
||||
ast_copy_string(outbuf, string, buflen);
|
||||
|
||||
while (*ptr) {
|
||||
while (*ptr && out - outbuf < buflen - 1) {
|
||||
if ((const signed char) *ptr < 32 || *ptr == 0x7f || *ptr == '%' ||
|
||||
(do_special_char &&
|
||||
!(*ptr >= '0' && *ptr <= '9') && /* num */
|
||||
!(*ptr >= 'A' && *ptr <= 'Z') && /* ALPHA */
|
||||
!(*ptr >= 'a' && *ptr <= 'z') && /* alpha */
|
||||
!strchr(mark, *ptr))) { /* mark set */
|
||||
|
||||
/* Oops, we need to start working here */
|
||||
if (!buf) {
|
||||
buf = outbuf;
|
||||
out = buf + (ptr - string) ; /* Set output ptr */
|
||||
if (out - outbuf >= buflen - 3) {
|
||||
break;
|
||||
}
|
||||
|
||||
out += sprintf(out, "%%%02X", (unsigned char) *ptr);
|
||||
} else if (buf) {
|
||||
} else {
|
||||
*out = *ptr; /* Continue copying the string */
|
||||
out++;
|
||||
}
|
||||
ptr++;
|
||||
}
|
||||
if (buf)
|
||||
|
||||
if (buflen) {
|
||||
*out = '\0';
|
||||
}
|
||||
|
||||
return outbuf;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user