dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Qualify trumps poke per lmadsen. 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@164814 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2008-12-16 20:47:31 +00:00
parent 46d73de2d0
commit 313cfcaa41
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -30,9 +30,9 @@ SIP Changes
after T38 is negotiated. This option is disabled by default.
* If ATTENDED_TRANSFER_COMPLETE_SOUND is set, the sound will be played to the
target of an attended transfer
* Added two new configuration options, "pokegap" and "pokepeers", which allow
finer control over how many peers Asterisk will poke and the gap between them
when all peers need to be poked at the same time.
* Added two new configuration options, "qualifygap" and "qualifypeers", which allow
finer control over how many peers Asterisk will qualify and the gap between them
when all peers need to be qualified at the same time.
Skinny Changes
--------------

30
channels/chan_sip.c
View File

@ -491,11 +491,11 @@ static int max_expiry = DEFAULT_MAX_EXPIRY; /*!< Maximum accepted registr
static int default_expiry = DEFAULT_DEFAULT_EXPIRY;
static int mwi_expiry = DEFAULT_MWI_EXPIRY;
#define DEFAULT_POKE_GAP 100
#define DEFAULT_POKE_PEERS 1
#define DEFAULT_QUALIFY_GAP 100
#define DEFAULT_QUALIFY_PEERS 1
static int global_poke_gap = DEFAULT_POKE_GAP; /*!< Time between our group of peer pokes */
static int global_poke_peers = DEFAULT_POKE_PEERS; /*!< Number of peers to poke at a given time */
static int global_qualify_gap = DEFAULT_QUALIFY_GAP; /*!< Time between our group of peer pokes */
static int global_qualify_peers = DEFAULT_QUALIFY_PEERS; /*!< Number of peers to poke at a given time */
#define CALLERID_UNKNOWN "Unknown"
@ -22551,8 +22551,8 @@ static int reload_config(enum channelreloadreason reason)
global_max_se = DEFAULT_MAX_SE;
/* Peer poking settings */
global_poke_gap = DEFAULT_POKE_GAP;
global_poke_peers = DEFAULT_POKE_PEERS;
global_qualify_gap = DEFAULT_QUALIFY_GAP;
global_qualify_peers = DEFAULT_QUALIFY_PEERS;
/* Initialize some reasonable defaults at SIP reload (used both for channel and as default for devices */
ast_copy_string(default_context, DEFAULT_CONTEXT, sizeof(default_context));
@ -23011,15 +23011,15 @@ static int reload_config(enum channelreloadreason reason)
} else {
global_st_refresher = i;
}
} else if (!strcasecmp(v->name, "pokegap")) {
if (sscanf(v->value, "%d", &global_poke_gap) != 1) {
ast_log(LOG_WARNING, "Invalid pokegap '%s' at line %d of %s\n", v->value, v->lineno, config);
global_poke_gap = DEFAULT_POKE_GAP;
} else if (!strcasecmp(v->name, "qualifygap")) {
if (sscanf(v->value, "%d", &global_qualify_gap) != 1) {
ast_log(LOG_WARNING, "Invalid qualifygap '%s' at line %d of %s\n", v->value, v->lineno, config);
global_qualify_gap = DEFAULT_QUALIFY_GAP;
}
} else if (!strcasecmp(v->name, "pokepeers")) {
if (sscanf(v->value, "%d", &global_poke_peers) != 1) {
} else if (!strcasecmp(v->name, "qualifypeers")) {
if (sscanf(v->value, "%d", &global_qualify_peers) != 1) {
ast_log(LOG_WARNING, "Invalid pokepeers '%s' at line %d of %s\n", v->value, v->lineno, config);
global_poke_peers = DEFAULT_POKE_PEERS;
global_qualify_peers = DEFAULT_QUALIFY_PEERS;
}
}
}
@ -23709,8 +23709,8 @@ static void sip_poke_all_peers(void)
while ((peer = ao2_t_iterator_next(&i, "iterate thru peers table"))) {
ao2_lock(peer);
if (num == global_poke_peers) {
ms += global_poke_gap;
if (num == global_qualify_peers) {
ms += global_qualify_gap;
num = 0;
} else {
num++;

4
configs/sip.conf.sample
View File

@ -148,8 +148,8 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; host to be up in seconds
; Set to low value if you use low timeout for
; NAT of UDP sessions
;pokegap=100 ; Number of milliseconds between each group of peers being poked
;pokepeers=1 ; Number of peers in a group to be poked at the same time
;qualifygap=100 ; Number of milliseconds between each group of peers being qualified
;qualifypeers=1 ; Number of peers in a group to be qualified at the same time
;notifymimetype=text/plain ; Allow overriding of mime type in MWI NOTIFY
;buggymwi=no ; Cisco SIP firmware doesn't support the MWI RFC
; fully. Enable this option to not get error messages