kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-03 11:50:29 +00:00
Code Issues Projects Releases Wiki Activity

backport change from the iaxclient sf repository rev 597.

Browse Source 
adds proper POKE support and a bit better handling of binding failures and port selection.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5154 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-05-11 17:49:38 +00:00
parent 2ae95b3754
commit 0272fcb2a0
2 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/iax/src/iax-client.h
View File

@ -81,6 +81,7 @@ struct iax_session;
#define IAX_EVENT_REGREJ 30 /* Registration reply */ #define IAX_EVENT_REGREJ 30 /* Registration reply */
#define IAX_EVENT_LINKURL 31 /* Unlink */ #define IAX_EVENT_LINKURL 31 /* Unlink */
#define IAX_EVENT_CNG 32 /* Comfort-noise (almost silence) */ #define IAX_EVENT_CNG 32 /* Comfort-noise (almost silence) */
#define IAX_EVENT_POKE 33
/* moved from iax.c to support attended transfer */ /* moved from iax.c to support attended transfer */
#define IAX_EVENT_REREQUEST 999 #define IAX_EVENT_REREQUEST 999

58
libs/iax/src/iax.c
View File

@ -969,23 +969,35 @@ int iax_init(char *ip, int preferredportno)
return -1; return -1;
} }
if (preferredportno == 0) if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO;
preferredportno = IAX_DEFAULT_PORTNO; if (preferredportno < 0) preferredportno = 0;
if (preferredportno > 0) { sin.sin_family = AF_INET;
sin.sin_family = AF_INET; sin.sin_addr.s_addr = 0;
if (ip) { sin.sin_port = htons((short)preferredportno);
inet_aton(ip, &sin.sin_addr); if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0)
} else { {
sin.sin_addr.s_addr = 0; #if defined(WIN32) || defined(_WIN32_WCE)
} if (WSAGetLastError() == WSAEADDRINUSE)
#else
sin.sin_port = htons((short)preferredportno); if (errno == EADDRINUSE)
if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) { #endif
DEBU(G "Unable to bind to preferred port. Using random one instead."); {
} /*the port is already in use, so bind to a free port chosen by the IP stack*/
} DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one");
sinlen = sizeof(sin); sin.sin_port = htons((short)0);
if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0)
{
IAXERROR "Unable to bind UDP socket\n");
return -1;
}
} else
{
IAXERROR "Unable to bind UDP socket\n");
return -1;
}
}
sinlen = sizeof(sin);
if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0) { if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0) {
close(netfd); close(netfd);
netfd = -1; netfd = -1;
@ -1561,6 +1573,12 @@ static struct iax_event *handle_event(struct iax_event *event)
iax_send_pong(event->session, event->ts); iax_send_pong(event->session, event->ts);
iax_event_free(event); iax_event_free(event);
break; break;
case IAX_EVENT_POKE:
event->etype = IAX_EVENT_PONG;
iax_send_pong(event->session, event->ts);
destroy_session(event->session);
iax_event_free(event);
break;
default: default:
return event; return event;
} }
@ -2652,8 +2670,10 @@ static struct iax_event *iax_header_to_event(struct iax_session *session,
e->ts = ts; e->ts = ts;
e = schedule_delivery(e, ts, updatehistory); e = schedule_delivery(e, ts, updatehistory);
break; break;
case IAX_COMMAND_PING: case IAX_COMMAND_POKE:
case IAX_COMMAND_POKE: e->etype = IAX_EVENT_POKE;
e->ts = ts;
break; case IAX_COMMAND_PING:
/* PINGS and PONGS don't get scheduled; */ /* PINGS and PONGS don't get scheduled; */
e->etype = IAX_EVENT_PING; e->etype = IAX_EVENT_PING;
e->ts = ts; e->ts = ts;