Compare commits

...

6 Commits

Author SHA1 Message Date
Russell Bryant
808eb58795 Importing files for 1.2.26.1-netsec release
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.26.1-netsec@94262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 20:34:34 +00:00
Russell Bryant
6477464f81 Creating tag for the release of asterisk-1.2.26.1-netsec
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.26.1-netsec@94261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 20:33:34 +00:00
Russell Bryant
c745498420 sync with 1.2
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@94260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 20:32:58 +00:00
Russell Bryant
064f862cc1 Importing files for 1.2.26.1-netsec release
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.26.1-netsec@94250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 19:23:57 +00:00
Russell Bryant
7b0f5dc5e9 Creating tag for the release of asterisk-1.2.26.1-netsec
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.26.1-netsec@94249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 19:21:58 +00:00
Automerge script
78a7859692 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@94244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 17:58:00 +00:00
4 changed files with 6522 additions and 4 deletions

1
.lastclean Normal file
View File

@@ -0,0 +1 @@
9

1
.version Normal file
View File

@@ -0,0 +1 @@
1.2.26.1-netsec

6516
ChangeLog Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -2620,7 +2620,7 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin,
static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in *sin)
{
struct ast_variable *var;
struct ast_variable *var = NULL;
struct ast_variable *tmp;
struct iax2_peer *peer=NULL;
time_t regseconds, nowtime;
@@ -2629,7 +2629,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
if (peername) {
var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
if (!var)
if (!var && sin)
var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
} else if (sin) {
char porta[25];
@@ -2646,7 +2646,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
}
}
}
if (!var) { /* Last ditch effort */
if (!var && peername) { /* Last ditch effort */
var = ast_load_realtime("iaxpeers", "name", peername, NULL);
/*!\note
* If this one loaded something, then we need to ensure that the host
@@ -2654,7 +2654,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
* is because we only have the IP address and the host field might be
* set as a name (and the reverse PTR might not match).
*/
if (var) {
if (var && sin) {
for (tmp = var; tmp; tmp = tmp->next) {
if (!strcasecmp(tmp->name, "host")) {
struct in_addr sin2 = { 0, };