kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 11:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_sip: option 'notifyringing' change and doc fix"

Browse Source
This commit is contained in:
Mark Michelson
2016-01-21 15:22:53 -06:00
committed by Gerrit Code Review
parent 5615db3714 d4b10cfb3e
commit 53570e2c6f
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_sip.c
View File

@@ -14655,7 +14655,7 @@ static void state_notify_build_xml(struct state_notify_data *data, int full, con
switch (data->state) { switch (data->state) {
case (AST_EXTENSION_RINGING | AST_EXTENSION_INUSE): case (AST_EXTENSION_RINGING | AST_EXTENSION_INUSE):
statestring = (sip_cfg.notifyringing) ? "early" : "confirmed"; statestring = (sip_cfg.notifyringing == NOTIFYRINGING_ENABLED) ? "early" : "confirmed";
local_state = NOTIFY_INUSE; local_state = NOTIFY_INUSE;
pidfstate = "busy"; pidfstate = "busy";
pidfnote = "Ringing"; pidfnote = "Ringing";
@@ -21193,7 +21193,7 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_
ast_cli(a->fd, " Outbound reg. timeout: %d secs\n", global_reg_timeout); ast_cli(a->fd, " Outbound reg. timeout: %d secs\n", global_reg_timeout);
ast_cli(a->fd, " Outbound reg. attempts: %d\n", global_regattempts_max); ast_cli(a->fd, " Outbound reg. attempts: %d\n", global_regattempts_max);
ast_cli(a->fd, " Outbound reg. retry 403:%d\n", global_reg_retry_403); ast_cli(a->fd, " Outbound reg. retry 403:%d\n", global_reg_retry_403);
ast_cli(a->fd, " Notify ringing state: %s\n", AST_CLI_YESNO(sip_cfg.notifyringing)); ast_cli(a->fd, " Notify ringing state: %s%s\n", AST_CLI_YESNO(sip_cfg.notifyringing), sip_cfg.notifyringing == NOTIFYRINGING_NOTINUSE ? " (when not in use)" : "");
if (sip_cfg.notifyringing) { if (sip_cfg.notifyringing) {
ast_cli(a->fd, " Include CID: %s%s\n", ast_cli(a->fd, " Include CID: %s%s\n",
AST_CLI_YESNO(sip_cfg.notifycid), AST_CLI_YESNO(sip_cfg.notifycid),
@@ -31740,7 +31740,11 @@ static int reload_config(enum channelreloadreason reason)
} else if (!strcasecmp(v->name, "directrtpsetup")) { } else if (!strcasecmp(v->name, "directrtpsetup")) {
sip_cfg.directrtpsetup = ast_true(v->value); sip_cfg.directrtpsetup = ast_true(v->value);
} else if (!strcasecmp(v->name, "notifyringing")) { } else if (!strcasecmp(v->name, "notifyringing")) {
sip_cfg.notifyringing = ast_true(v->value); if (!strcasecmp(v->value, "notinuse")) {
sip_cfg.notifyringing = NOTIFYRINGING_NOTINUSE;
} else {
sip_cfg.notifyringing = ast_true(v->value) ? NOTIFYRINGING_ENABLED : NOTIFYRINGING_DISABLED;
}
} else if (!strcasecmp(v->name, "notifyhold")) { } else if (!strcasecmp(v->name, "notifyhold")) {
sip_cfg.notifyhold = ast_true(v->value); sip_cfg.notifyhold = ast_true(v->value);
} else if (!strcasecmp(v->name, "notifycid")) { } else if (!strcasecmp(v->name, "notifycid")) {

9
channels/sip/include/sip.h
View File

@@ -211,7 +211,7 @@
#define DEFAULT_ALLOW_EXT_DOM TRUE /*!< Allow external domains */ #define DEFAULT_ALLOW_EXT_DOM TRUE /*!< Allow external domains */
#define DEFAULT_REALM "asterisk" /*!< Realm for HTTP digest authentication */ #define DEFAULT_REALM "asterisk" /*!< Realm for HTTP digest authentication */
#define DEFAULT_DOMAINSASREALM FALSE /*!< Use the domain option to guess the realm for registration and invite requests */ #define DEFAULT_DOMAINSASREALM FALSE /*!< Use the domain option to guess the realm for registration and invite requests */
#define DEFAULT_NOTIFYRINGING TRUE /*!< Notify devicestate system on ringing state */ #define DEFAULT_NOTIFYRINGING NOTIFYRINGING_ENABLED /*!< Notify devicestate system on ringing state */
#define DEFAULT_NOTIFYCID DISABLED /*!< Include CID with ringing notifications */ #define DEFAULT_NOTIFYCID DISABLED /*!< Include CID with ringing notifications */
#define DEFAULT_PEDANTIC TRUE /*!< Follow SIP standards for dialog matching */ #define DEFAULT_PEDANTIC TRUE /*!< Follow SIP standards for dialog matching */
#define DEFAULT_AUTOCREATEPEER AUTOPEERS_DISABLED /*!< Don't create peers automagically */ #define DEFAULT_AUTOCREATEPEER AUTOPEERS_DISABLED /*!< Don't create peers automagically */
@@ -622,6 +622,13 @@ enum sipmethod {
SIP_PING, /*!< Not supported at all, no standard but still implemented out there */ SIP_PING, /*!< Not supported at all, no standard but still implemented out there */
}; };
/*! \brief Setting for the 'notifyringing' option, see sip.conf.sample for details. */
enum notifyringing_setting {
NOTIFYRINGING_DISABLED = 0,
NOTIFYRINGING_ENABLED = 1,
NOTIFYRINGING_NOTINUSE = 2,
};
/*! \brief Settings for the 'notifycid' option, see sip.conf.sample for details. */ /*! \brief Settings for the 'notifycid' option, see sip.conf.sample for details. */
enum notifycid_setting { enum notifycid_setting {
DISABLED = 0, DISABLED = 0,

8
configs/samples/sip.conf.sample
View File

@@ -694,8 +694,12 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;subscribecontext = default ; Set a specific context for SUBSCRIBE requests ;subscribecontext = default ; Set a specific context for SUBSCRIBE requests
; Useful to limit subscriptions to local extensions ; Useful to limit subscriptions to local extensions
; Settable per peer/user also ; Settable per peer/user also
;notifyringing = no ; Control whether subscriptions already INUSE get sent ;notifyringing = no ; Control when subscriptions get notified of ringing state.
; RINGING when another call is sent (default: yes) ; Specify 'no' to not send any ringing notifications.
; Specify 'yes' to always send ringing notifications (default).
; Specify 'notinuse' to only send ringing notifications for
; extensions that are not currently in use. This is useful as a
; visual indication of who is available to pick up an incoming call
;notifyhold = yes ; Notify subscriptions on HOLD state (default: no) ;notifyhold = yes ; Notify subscriptions on HOLD state (default: no)
; Turning on notifyringing and notifyhold will add a lot ; Turning on notifyringing and notifyhold will add a lot
; more database transactions if you are using realtime. ; more database transactions if you are using realtime.