sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_pjsip_caller_id: Add ANI2/OLI parsing 

Adds parsing of ANI II digits (Originating
Line Information) to PJSIP, on par with
what currently exists in chan_sip.

ASTERISK-29472

Change-Id: Ifc938a7a7d45ce33999ebf3656a542226f6d3847
This commit is contained in:
Naveen Albert 2021-06-08 16:44:23 -04:00 committed by N A
parent a03b10cb09
commit 7feee9c65b
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
channels/chan_pjsip.c
View File

@ -625,6 +625,7 @@ static struct ast_channel *chan_pjsip_new(struct ast_sip_session *session, int s
ast_party_id_copy(&ast_channel_caller(chan)->id, &session->id);
ast_party_id_copy(&ast_channel_caller(chan)->ani, &session->id);
ast_channel_caller(chan)->ani2 = session->ani2;
if (!ast_strlen_zero(exten)) {
/* Set provided DNID on the new channel. */

2
include/asterisk/res_pjsip_session.h
View File

@ -227,6 +227,8 @@ struct ast_sip_session {
AST_VECTOR(, struct ast_rtp_instance_stats *) media_stats;
/*! Number of challenges received during outgoing requests to determine if we are in a loop */
unsigned int authentication_challenge_count:4;
/*! Originating Line Info (ANI II digits) */
int ani2;
};
typedef int (*ast_sip_session_request_creation_cb)(struct ast_sip_session *session, pjsip_tx_data *tdata);

59
res/res_pjsip_caller_id.c
View File

@ -33,6 +33,7 @@
#include "asterisk/channel.h"
#include "asterisk/module.h"
#include "asterisk/callerid.h"
#include "asterisk/conversions.h"
/*!
* \internal
@ -119,6 +120,58 @@ static pjsip_fromto_hdr *get_id_header(pjsip_rx_data *rdata, const pj_str_t *hea
return parsed_hdr;
}
/*!
* \internal
* \brief Set an ANI2 integer based on OLI data in a From header
*
* This uses the contents of a From header in order to set Originating Line information.
*
* \param rdata The incoming message
* \param ani2 The ANI2 field to set
* \retval 0 Successfully parsed OLI
* \retval non-zero Could not parse OLI
*/
static int set_id_from_oli(pjsip_rx_data *rdata, int *ani2)
{
char fromhdr[AST_CHANNEL_NAME];
const char *s = NULL;
pjsip_sip_uri *uri;
pjsip_name_addr *id_name_addr;
pjsip_fromto_hdr *from = pjsip_msg_find_hdr(rdata->msg_info.msg,
PJSIP_H_FROM, rdata->msg_info.msg->hdr.next);
id_name_addr = (pjsip_name_addr *) from->uri;
if (!from) {
/* This had better not happen */
return -1;
}
uri = pjsip_uri_get_uri(id_name_addr);
ast_copy_pj_str(fromhdr, &uri->user, sizeof(fromhdr));
/* Look for the possible OLI tags. */
if ((s = strcasestr(fromhdr, ";isup-oli="))) {
s += 10;
} else if ((s = strcasestr(fromhdr, ";ss7-oli="))) {
s += 9;
} else if ((s = strcasestr(fromhdr, ";oli="))) {
s += 5;
}
if (ast_strlen_zero(s)) {
/* OLI tag is missing, or present with nothing following the '=' sign */
return -1;
}
/* just in case OLI is quoted */
if (*s == '\"') {
s++;
}
return ast_str_to_int(s, ani2);
}
/*!
* \internal
* \brief Set an ast_party_id structure based on data in a P-Asserted-Identity header
@ -371,6 +424,7 @@ static void update_incoming_connected_line(struct ast_sip_session *session, pjsi
static int caller_id_incoming_request(struct ast_sip_session *session, pjsip_rx_data *rdata)
{
if (!session->channel) {
int ani2;
/*
* Since we have no channel this must be the initial inbound
* INVITE. Set the session ID directly because the channel
@ -387,6 +441,11 @@ static int caller_id_incoming_request(struct ast_sip_session *session, pjsip_rx_
if (!session->endpoint->id.self.number.valid) {
set_id_from_from(rdata, &session->id);
}
if (!set_id_from_oli(rdata, &ani2)) {
session->ani2 = ani2;
} else {
session->ani2 = 0;
}
} else {
/*
* ReINVITE or UPDATE. Check for changes to the ID and queue