cellular-infrastructure
/
osmo-sip-connector
mirror of https://gerrit.osmocom.org/osmo-sip-connector
9
0
Fork 0
Code Issues Releases Wiki Activity

sdp.c FIXME 

Change-Id: Iea61d25827893208cbb5323809908477a3118a54
This commit is contained in:
Neels Hofmeyr 2019-10-22 03:39:55 +02:00
parent effead9835
commit 71fa54959c
4 changed files with 109 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/call.c
View File

@ -179,6 +179,4 @@ void call_leg_update_sdp(struct call_leg *leg, const char *sdp)
if (!sdp || !*sdp) if (!sdp || !*sdp)
return; return;
OSMO_STRLCPY_ARRAY(leg->sdp, sdp); OSMO_STRLCPY_ARRAY(leg->sdp, sdp);
LOGP(DAPP, LOGL_NOTICE, "call(%u) leg(0x%p) received SDP: %s\n",
leg->call->id, leg, leg->sdp);
} }

263
src/sdp.c
View File

@ -32,223 +32,86 @@
#include <string.h> #include <string.h>
/* static const struct value_string sdp_mode_attr[] = {
* Check if the media mode attribute exists in SDP, in this { SDP_MODE_UNSET, ""},
* case update the passed pointer with the media mode { SDP_MODE_INACTIVE, "a=inactive\r\n"},
*/ { SDP_MODE_SENDRECV, "a=sendrecv\r\n"},
bool sdp_get_sdp_mode(const sip_t *sip, sdp_mode_t *mode) { { SDP_MODE_SENDONLY, "a=sendonly\r\n"},
{ SDP_MODE_RECVONLY, "a=recvonly\r\n"},
{}
};
const char *sdp_data; const struct value_string sdp_mode_names[] = {
sdp_parser_t *parser; { SDP_MODE_UNSET, "unset"},
sdp_session_t *sdp; { SDP_MODE_INACTIVE, "inactive"},
{ SDP_MODE_SENDRECV, "sendrecv"},
{ SDP_MODE_SENDONLY, "sendonly"},
{ SDP_MODE_RECVONLY, "recvonly"},
{}
};
if (!sip->sip_payload || !sip->sip_payload->pl_data) { /* Return location of a given SDP sendrecv mode attribute, if any. */
LOGP(DSIP, LOGL_ERROR, "No SDP file\n"); const char *sdp_find_mode(const char *sdp_str, enum sdp_mode mode)
return false;
}
sdp_data = sip->sip_payload->pl_data;
parser = sdp_parse(NULL, sdp_data, strlen(sdp_data), sdp_f_mode_0000);
if (!parser) {
LOGP(DSIP, LOGL_ERROR, "Failed to parse SDP\n");
return false;
}
sdp = sdp_session(parser);
if (!sdp) {
LOGP(DSIP, LOGL_ERROR, "No sdp session\n");
sdp_parser_free(parser);
return false;
}
if (!sdp->sdp_media || !sdp->sdp_media->m_mode) {
sdp_parser_free(parser);
return sdp_sendrecv;
}
sdp_parser_free(parser);
*mode = sdp->sdp_media->m_mode;
return true;
}
/*
* We want to decide on the audio codec later but we need to see
* if it is even including some of the supported ones.
*/
bool sdp_screen_sdp(const sip_t *sip)
{ {
const char *sdp_data; const char *found;
sdp_parser_t *parser; if (mode == SDP_MODE_UNSET)
sdp_session_t *sdp; return NULL;
sdp_media_t *media;
if (!sip->sip_payload || !sip->sip_payload->pl_data) { found = strstr(sdp_str, get_value_string(sdp_mode_attr, mode));
LOGP(DSIP, LOGL_ERROR, "No SDP file\n"); if (!found)
return false; return NULL;
}
sdp_data = sip->sip_payload->pl_data; /* At the start of the line? */
parser = sdp_parse(NULL, sdp_data, strlen(sdp_data), 0); if (found > sdp_str && *(found-1) != '\n')
if (!parser) { return NULL;
LOGP(DSIP, LOGL_ERROR, "Failed to parse SDP\n");
return false;
}
sdp = sdp_session(parser); return found;
if (!sdp) {
LOGP(DSIP, LOGL_ERROR, "No sdp session\n");
sdp_parser_free(parser);
return false;
}
for (media = sdp->sdp_media; media; media = media->m_next) {
sdp_rtpmap_t *map;
if (media->m_proto != sdp_proto_rtp)
continue;
if (media->m_type != sdp_media_audio)
continue;
for (map = media->m_rtpmaps; map; map = map->rm_next) {
if (strcasecmp(map->rm_encoding, "GSM") == 0)
goto success;
if (strcasecmp(map->rm_encoding, "GSM-EFR") == 0)
goto success;
if (strcasecmp(map->rm_encoding, "GSM-HR-08") == 0)
goto success;
if (strcasecmp(map->rm_encoding, "AMR") == 0)
goto success;
}
}
sdp_parser_free(parser);
return false;
success:
sdp_parser_free(parser);
return true;
} }
bool sdp_extract_sdp(struct sip_call_leg *leg, const sip_t *sip, bool any_codec) /* Return the last SDP sendrecv mode attribute, or SDP_MODE_UNSET */
enum sdp_mode sdp_get_mode(const char *sdp_str, const char **found_at)
{ {
sdp_connection_t *conn; const char *at = NULL;
sdp_session_t *sdp; enum sdp_mode mode = SDP_MODE_UNSET;
sdp_parser_t *parser; enum sdp_mode i;
sdp_media_t *media; for (i = 0; i < SDP_MODES_COUNT; i++) {
const char *sdp_data; const char *found = sdp_find_mode(sdp_str, i);
bool found_conn = false, found_map = false; if (!found)
if (!sip->sip_payload || !sip->sip_payload->pl_data) {
LOGP(DSIP, LOGL_ERROR, "leg(%p) but no SDP file\n", leg);
return false;
}
sdp_data = sip->sip_payload->pl_data;
parser = sdp_parse(NULL, sdp_data, strlen(sdp_data), 0);
if (!parser) {
LOGP(DSIP, LOGL_ERROR, "leg(%p) failed to parse SDP\n",
leg);
return false;
}
sdp = sdp_session(parser);
if (!sdp) {
LOGP(DSIP, LOGL_ERROR, "leg(%p) no sdp session\n", leg);
sdp_parser_free(parser);
return false;
}
for (conn = sdp->sdp_connection; conn; conn = conn->c_next) {
struct in_addr addr;
if (conn->c_addrtype != sdp_addr_ip4)
continue; continue;
inet_aton(conn->c_address, &addr); /* If more than one sendrecv attrib are in the SDP string, let the last one win */
leg->base.ip = addr.s_addr; if (at > found)
found_conn = true;
break;
}
for (media = sdp->sdp_media; media; media = media->m_next) {
sdp_rtpmap_t *map;
if (media->m_proto != sdp_proto_rtp)
continue; continue;
if (media->m_type != sdp_media_audio) at = found;
continue; mode = i;
for (map = media->m_rtpmaps; map; map = map->rm_next) {
if (!any_codec && strcasecmp(map->rm_encoding, leg->wanted_codec) != 0)
continue;
leg->base.port = media->m_port;
leg->base.payload_type = map->rm_pt;
found_map = true;
break;
}
if (found_map)
break;
} }
if (!found_conn || !found_map) { if (found_at)
LOGP(DSIP, LOGL_ERROR, "leg(%p) did not find %d/%d\n", *found_at = at;
leg, found_conn, found_map); return mode;
sdp_parser_free(parser);
return false;
}
sdp_parser_free(parser);
return true;
} }
char *sdp_create_file(struct sip_call_leg *leg, struct call_leg *other, sdp_mode_t mode) /* Remove all pre-existing occurences of an SDP mode attribute, and then add the given mode attribute (if not
* SDP_MODE_UNSET). Allocate the resulting string from ctx (talloc). */
char *sdp_copy_and_set_mode(void *ctx, const char *sdp_str, enum sdp_mode mode)
{ {
struct in_addr net = { .s_addr = other->ip }; char *removed = talloc_strdup(ctx, sdp_str);
char *fmtp_str = NULL, *sdp; char *added;
char *mode_attribute; char *found_at;
char ip_addr[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr)); /* Remove */
leg->wanted_codec = app_media_name(other->payload_msg_type); while (sdp_get_mode(removed, (const char**)&found_at) != SDP_MODE_UNSET) {
char *next_line = strchr(found_at, '\n');
if (strcmp(leg->wanted_codec, "AMR") == 0) if (!next_line)
fmtp_str = talloc_asprintf(leg, "a=fmtp:%d octet-align=1\r\n", other->payload_type); *found_at = '\0';
else
switch (mode) { strcpy(found_at, next_line);
case sdp_inactive:
mode_attribute = "a=inactive\r\n";
break;
case sdp_sendrecv:
mode_attribute = "a=sendrecv\r\n";
break;
case sdp_sendonly:
mode_attribute = "a=sendonly\r\n";
break;
case sdp_recvonly:
mode_attribute = "a=recvonly\r\n";
break;
default:
OSMO_ASSERT(false);
break;
} }
sdp = talloc_asprintf(leg, /* Add */
"v=0\r\n" if (mode == SDP_MODE_UNSET)
"o=Osmocom 0 0 IN IP4 %s\r\n" return removed;
"s=GSM Call\r\n"
"c=IN IP4 %s\r\n" added = talloc_asprintf(ctx, "%s%s", removed, get_value_string(sdp_mode_attr, mode));
"t=0 0\r\n" talloc_free(removed);
"m=audio %d RTP/AVP %d\r\n" return added;
"%s"
"a=rtpmap:%d %s/8000\r\n"
"%s",
ip_addr, ip_addr,
other->port, other->payload_type,
fmtp_str ? fmtp_str : "",
other->payload_type,
leg->wanted_codec,
mode_attribute);
talloc_free(fmtp_str);
return sdp;
} }

25
src/sdp.h
View File

@ -1,15 +1,20 @@
#pragma once #pragma once
#include <sofia-sip/sip.h> #include <osmocom/core/utils.h>
#include <sofia-sip/sdp.h>
#include <stdbool.h> enum sdp_mode {
SDP_MODE_UNSET = 0,
SDP_MODE_INACTIVE,
SDP_MODE_SENDRECV,
SDP_MODE_SENDONLY,
SDP_MODE_RECVONLY,
SDP_MODES_COUNT,
};
struct sip_call_leg; extern const struct value_string sdp_mode_names[];
struct call_leg; static inline const char *sdp_mode_name(enum sdp_mode mode)
{ return get_value_string(sdp_mode_names, mode); }
bool sdp_get_sdp_mode(const sip_t *sip, sdp_mode_t *mode); const char *sdp_find_mode(const char *sdp_str, enum sdp_mode mode);
bool sdp_screen_sdp(const sip_t *sip); enum sdp_mode sdp_get_mode(const char *sdp_str, const char **found_at);
bool sdp_extract_sdp(struct sip_call_leg *leg, const sip_t *sip, bool any_codec); char *sdp_copy_and_set_mode(void *ctx, const char *sdp_str, enum sdp_mode mode);
char *sdp_create_file(struct sip_call_leg *, struct call_leg *, sdp_mode_t mode);

72
src/sip.c
View File

@ -104,7 +104,6 @@ static void new_call(struct sip_agent *agent, nua_handle_t *nh,
struct call *call; struct call *call;
struct sip_call_leg *leg; struct sip_call_leg *leg;
const char *from = NULL, *to = NULL; const char *from = NULL, *to = NULL;
char ip_addr[INET_ADDRSTRLEN];
LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh);
@ -146,11 +145,10 @@ static void new_call(struct sip_agent *agent, nua_handle_t *nh,
static void sip_handle_reinvite(struct sip_call_leg *leg, nua_handle_t *nh, const sip_t *sip) { static void sip_handle_reinvite(struct sip_call_leg *leg, nua_handle_t *nh, const sip_t *sip) {
const char *reinvite_sdp;
char *sdp; char *sdp;
sdp_mode_t mode = sdp_sendrecv; enum sdp_mode mode;
uint32_t ip = leg->base.ip; enum sdp_mode mode_other;
uint16_t port = leg->base.port;
char ip_addr[INET_ADDRSTRLEN];
LOGP(DSIP, LOGL_INFO, "re-INVITE for call %s\n", sip->sip_call_id->i_id); LOGP(DSIP, LOGL_INFO, "re-INVITE for call %s\n", sip->sip_call_id->i_id);
@ -162,11 +160,12 @@ static void sip_handle_reinvite(struct sip_call_leg *leg, nua_handle_t *nh, cons
return; return;
} }
if (!sdp_get_sdp_mode(sip, &mode)) { reinvite_sdp = sip_get_sdp(sip);
if (!reinvite_sdp) {
/* re-INVITE with no SDP. /* re-INVITE with no SDP.
* We should respond with SDP reflecting current session * We should respond with SDP reflecting current session
*/ */
sdp = sdp_create_file(leg, other, sdp_sendrecv); sdp = sdp_copy_and_set_mode(leg, other->sdp, SDP_MODE_SENDRECV);
nua_respond(nh, SIP_200_OK, nua_respond(nh, SIP_200_OK,
NUTAG_MEDIA_ENABLE(0), NUTAG_MEDIA_ENABLE(0),
SIPTAG_CONTENT_TYPE_STR("application/sdp"), SIPTAG_CONTENT_TYPE_STR("application/sdp"),
@ -176,37 +175,32 @@ static void sip_handle_reinvite(struct sip_call_leg *leg, nua_handle_t *nh, cons
return; return;
} }
struct in_addr net = { .s_addr = leg->base.ip }; mode = sdp_get_mode(reinvite_sdp, NULL);
inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));
LOGP(DSIP, LOGL_DEBUG, "pre re-INVITE have IP:port (%s:%u)\n", ip_addr, leg->base.port);
call_leg_update_sdp(&leg->base, sip_get_sdp(sip)); call_leg_update_sdp(&leg->base, reinvite_sdp);
if (mode == sdp_sendonly) { switch (mode) {
case SDP_MODE_SENDONLY:
/* SIP side places call on HOLD */ /* SIP side places call on HOLD */
sdp = sdp_create_file(leg, other, sdp_recvonly); mode_other = SDP_MODE_RECVONLY;
/* TODO: Tell core network to stop sending RTP ? */ break;
} else { case SDP_MODE_RECVONLY:
/* SIP re-INVITE may want to change media, IP, port */ mode_other = SDP_MODE_SENDONLY;
if (!sdp_extract_sdp(leg, sip, true)) { break;
LOGP(DSIP, LOGL_ERROR, "leg(%p) no audio, releasing\n", leg); case SDP_MODE_INACTIVE:
nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); mode_other = SDP_MODE_INACTIVE;
nua_handle_destroy(nh); break;
call_leg_release(&leg->base); default:
return; mode_other = SDP_MODE_SENDRECV;
} break;
struct in_addr net = { .s_addr = leg->base.ip };
inet_ntop(AF_INET, &net, ip_addr, sizeof(ip_addr));
LOGP(DSIP, LOGL_DEBUG, "Media IP:port in re-INVITE: (%s:%u)\n", ip_addr, leg->base.port);
if (ip != leg->base.ip || port != leg->base.port) {
LOGP(DSIP, LOGL_INFO, "re-INVITE changes media connection.\n");
if (other->update_rtp)
other->update_rtp(leg->base.call->remote);
}
sdp = sdp_create_file(leg, other, sdp_sendrecv);
} }
LOGP(DSIP, LOGL_DEBUG, "Sending 200 response to re-INVITE for mode(%u)\n", mode); if (other->update_rtp)
other->update_rtp(leg->base.call->remote);
sdp = sdp_copy_and_set_mode(leg, other->sdp, mode_other);
LOGP(DSIP, LOGL_DEBUG, "Sending 200 response (%s) to re-INVITE with mode '%s'\n",
sdp_mode_name(mode_other), sdp_mode_name(mode));
nua_respond(nh, SIP_200_OK, nua_respond(nh, SIP_200_OK,
NUTAG_MEDIA_ENABLE(0), NUTAG_MEDIA_ENABLE(0),
SIPTAG_CONTENT_TYPE_STR("application/sdp"), SIPTAG_CONTENT_TYPE_STR("application/sdp"),
@ -472,17 +466,13 @@ static void sip_connect_call(struct call_leg *_leg)
OSMO_ASSERT(_leg->type == CALL_TYPE_SIP); OSMO_ASSERT(_leg->type == CALL_TYPE_SIP);
leg = (struct sip_call_leg *) _leg; leg = (struct sip_call_leg *) _leg;
/*
* TODO/FIXME: check if resulting codec is compatible..
*/
other = call_leg_other(&leg->base); other = call_leg_other(&leg->base);
if (!other) { if (!other) {
sip_release_call(&leg->base); sip_release_call(&leg->base);
return; return;
} }
sdp = sdp_create_file(leg, other, sdp_sendrecv); sdp = sdp_copy_and_set_mode(leg, other->sdp, SDP_MODE_SENDRECV);
leg->state = SIP_CC_CONNECTED; leg->state = SIP_CC_CONNECTED;
nua_respond(leg->nua_handle, SIP_200_OK, nua_respond(leg->nua_handle, SIP_200_OK,
@ -521,7 +511,7 @@ static void sip_hold_call(struct call_leg *_leg)
sip_release_call(&leg->base); sip_release_call(&leg->base);
return; return;
} }
char *sdp = sdp_create_file(leg, other_leg, sdp_sendonly); char *sdp = sdp_copy_and_set_mode(leg, other_leg->sdp, SDP_MODE_SENDONLY);
nua_invite(leg->nua_handle, nua_invite(leg->nua_handle,
NUTAG_MEDIA_ENABLE(0), NUTAG_MEDIA_ENABLE(0),
SIPTAG_CONTENT_TYPE_STR("application/sdp"), SIPTAG_CONTENT_TYPE_STR("application/sdp"),
@ -543,7 +533,7 @@ static void sip_retrieve_call(struct call_leg *_leg)
sip_release_call(&leg->base); sip_release_call(&leg->base);
return; return;
} }
char *sdp = sdp_create_file(leg, other_leg, sdp_sendrecv); char *sdp = sdp_copy_and_set_mode(leg, other_leg->sdp, SDP_MODE_SENDRECV);
nua_invite(leg->nua_handle, nua_invite(leg->nua_handle,
NUTAG_MEDIA_ENABLE(0), NUTAG_MEDIA_ENABLE(0),
SIPTAG_CONTENT_TYPE_STR("application/sdp"), SIPTAG_CONTENT_TYPE_STR("application/sdp"),
@ -566,7 +556,7 @@ static int send_invite(struct sip_agent *agent, struct sip_call_leg *leg,
called_num, called_num,
agent->app->sip.remote_addr, agent->app->sip.remote_addr,
agent->app->sip.remote_port); agent->app->sip.remote_port);
char *sdp = sdp_create_file(leg, other, sdp_sendrecv); char *sdp = sdp_copy_and_set_mode(leg, other->sdp, SDP_MODE_SENDRECV);
leg->state = SIP_CC_INITIAL; leg->state = SIP_CC_INITIAL;
leg->dir = SIP_DIR_MT; leg->dir = SIP_DIR_MT;