williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Osmo-CC: Change UPDATE to MODIFY message

Browse Source 
Naming it UPDATE was not a good idea.

Now this is renamed to MODIFY message, related to MNCC (GSM). It is used
to change media coding during a call. It allows new codec negotiation
using SDP protocol and/or changing RTP peer. Also useful for SIP.
This commit is contained in:
Andreas Eversberg
2022-11-14 20:43:06 +01:00
parent 2110a0f111
commit aadfd50a0f
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libosmocc/endpoint.c
View File

@@ -568,18 +568,30 @@ static void notify_ind(osmo_cc_call_t *call, osmo_cc_msg_t *msg)
forward_to_ul(call, msg); forward_to_ul(call, msg);
} }
static void update_req(osmo_cc_call_t *call, osmo_cc_msg_t *msg) static void modify_req(osmo_cc_call_t *call, osmo_cc_msg_t *msg)
{ {
/* to lower layer */ /* to lower layer */
forward_to_ll(call, msg); forward_to_ll(call, msg);
} }
static void update_cnf(osmo_cc_call_t *call, osmo_cc_msg_t *msg) static void modify_cnf(osmo_cc_call_t *call, osmo_cc_msg_t *msg)
{ {
/* to upper layer */ /* to upper layer */
forward_to_ul(call, msg); forward_to_ul(call, msg);
} }
static void modify_ind(osmo_cc_call_t *call, osmo_cc_msg_t *msg)
{
/* to upper layer */
forward_to_ul(call, msg);
}
static void modify_rsp(osmo_cc_call_t *call, osmo_cc_msg_t *msg)
{
/* to lower layer */
forward_to_ll(call, msg);
}
static void disc_req(osmo_cc_call_t *call, osmo_cc_msg_t *msg) static void disc_req(osmo_cc_call_t *call, osmo_cc_msg_t *msg)
{ {
/* change state */ /* change state */
@@ -866,9 +878,13 @@ static struct statemachine {
{SBIT(OSMO_CC_STATE_ACTIVE), {SBIT(OSMO_CC_STATE_ACTIVE),
OSMO_CC_MSG_INFO_REQ, info_req}, OSMO_CC_MSG_INFO_REQ, info_req},
{SBIT(OSMO_CC_STATE_ACTIVE), {SBIT(OSMO_CC_STATE_ACTIVE),
OSMO_CC_MSG_UPDATE_REQ, update_req}, OSMO_CC_MSG_MODIFY_REQ, modify_req},
{SBIT(OSMO_CC_STATE_ACTIVE), {SBIT(OSMO_CC_STATE_ACTIVE),
OSMO_CC_MSG_UPDATE_CNF, update_cnf}, OSMO_CC_MSG_MODIFY_CNF, modify_cnf},
{SBIT(OSMO_CC_STATE_ACTIVE),
OSMO_CC_MSG_MODIFY_IND, modify_ind},
{SBIT(OSMO_CC_STATE_ACTIVE),
OSMO_CC_MSG_MODIFY_RSP, modify_rsp},
/* call release */ /* call release */
{SBIT(OSMO_CC_STATE_INIT_OUT) | SBIT(OSMO_CC_STATE_INIT_IN) | {SBIT(OSMO_CC_STATE_INIT_OUT) | SBIT(OSMO_CC_STATE_INIT_IN) |

6
src/libosmocc/message.h
View File

@@ -30,8 +30,10 @@ enum osmo_cc_msg_type {
OSMO_CC_MSG_NOTIFY_IND = 0x85, OSMO_CC_MSG_NOTIFY_IND = 0x85,
OSMO_CC_MSG_INFO_REQ = 0x88, OSMO_CC_MSG_INFO_REQ = 0x88,
OSMO_CC_MSG_INFO_IND = 0x89, OSMO_CC_MSG_INFO_IND = 0x89,
OSMO_CC_MSG_UPDATE_REQ = 0x91, OSMO_CC_MSG_MODIFY_REQ = 0x90,
OSMO_CC_MSG_UPDATE_CNF = 0x93, OSMO_CC_MSG_MODIFY_IND = 0x91,
OSMO_CC_MSG_MODIFY_RSP = 0x92,
OSMO_CC_MSG_MODIFY_CNF = 0x93,
OSMO_CC_MSG_ATTACH_REQ = 0xf8, OSMO_CC_MSG_ATTACH_REQ = 0xf8,
OSMO_CC_MSG_ATTACH_IND = 0xf9, OSMO_CC_MSG_ATTACH_IND = 0xf9,
OSMO_CC_MSG_ATTACH_RSP = 0xfa, OSMO_CC_MSG_ATTACH_RSP = 0xfa,