mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 821066 - Remove dead remotedesc/localdesc messages and events from sipcc. r=abr

This commit is contained in:
Alexandros Chronopoulos 2013-02-04 16:18:26 -05:00
Родитель 0938b96ba6
Коммит 6556e8e870
3 изменённых файлов: 0 добавлений и 121 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

19
media/webrtc/signaling/src/sipcc/core/gsm/ccapi.c
Просмотреть файл

@ -1276,25 +1276,6 @@ void cc_setremotedesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, lin
return;
}
void cc_localdesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
cc_features_t feature_id, cc_feature_data_t *data)
{
send_message_helper(CC_MSG_LOCALDESC, src_id, dst_id, call_id, line,
feature_id, data, NULL, 0);
return;
}
void cc_remotedesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
cc_features_t feature_id, cc_feature_data_t *data)
{
send_message_helper(CC_MSG_REMOTEDESC, src_id, dst_id, call_id, line,
feature_id, data, NULL, 0);
return;
}
void
cc_int_feature_ack (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
line_t line, cc_features_t feature_id,

88
media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c
Просмотреть файл

@ -80,8 +80,6 @@ static sm_rcs_t fsmdef_ev_createanswer(sm_event_t *event);
static sm_rcs_t fsmdef_ev_setlocaldesc(sm_event_t *event);
static sm_rcs_t fsmdef_ev_setremotedesc(sm_event_t *event);
static sm_rcs_t fsmdef_ev_setpeerconnection(sm_event_t *event);
static sm_rcs_t fsmdef_ev_localdesc(sm_event_t *event);
static sm_rcs_t fsmdef_ev_remotedesc(sm_event_t *event);
static sm_rcs_t fsmdef_ev_addstream(sm_event_t *event);
static sm_rcs_t fsmdef_ev_removestream(sm_event_t *event);
static sm_rcs_t fsmdef_ev_addcandidate(sm_event_t *event);
@ -190,8 +188,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -252,8 +248,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -284,8 +278,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -316,8 +308,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -348,8 +338,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -380,8 +368,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -412,8 +398,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -444,8 +428,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -476,8 +458,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -508,8 +488,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -540,8 +518,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -572,8 +548,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -604,8 +578,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -636,8 +608,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -668,8 +638,6 @@ static sm_function_t fsmdef_function_table[FSMDEF_S_MAX][CC_MSG_MAX] =
/* CC_MSG_CREATEANSWER */ fsmdef_ev_createanswer,
/* CC_MSG_SETLOCALDESC */ fsmdef_ev_setlocaldesc,
/* CC_MSG_SETREMOTEDESC */ fsmdef_ev_setremotedesc,
/* CC_MSG_LOCALDESC */ fsmdef_ev_localdesc,
/* CC_MSG_REMOTEDESC */ fsmdef_ev_remotedesc,
/* CC_MSG_SETPEERCONNECTION */fsmdef_ev_setpeerconnection,
/* CC_MSG_ADDSTREAM */ fsmdef_ev_addstream,
/* CC_MSG_REMOVESTREAM */ fsmdef_ev_removestream,
@ -3402,62 +3370,6 @@ fsmdef_ev_setremotedesc(sm_event_t *event) {
return (SM_RC_END);
}
/* TODO -- remove me. See bug 821066. */
static sm_rcs_t
fsmdef_ev_localdesc(sm_event_t *event) {
fsm_fcb_t *fcb = (fsm_fcb_t *) event->data;
fsmdef_dcb_t *dcb = fcb->dcb;
cc_causes_t cause = CC_CAUSE_NORMAL;
int sdpmode = 0;
cc_causes_t lsm_rc;
cc_msgbody_t *part;
uint32_t body_length;
cc_msgbody_info_t msg_body;
FSM_DEBUG_SM(DEB_F_PREFIX"Entered.\n", DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
config_get_value(CFGID_SDPMODE, &sdpmode, sizeof(sdpmode));
if (!sdpmode) {
return (SM_RC_END);
}
if (dcb == NULL) {
FSM_DEBUG_SM(DEB_F_PREFIX"dcb is NULL.\n", DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
return SM_RC_CLEANUP;
}
return (SM_RC_END);
}
/* TODO -- remove me. See bug 821066. */
static sm_rcs_t
fsmdef_ev_remotedesc(sm_event_t *event) {
fsm_fcb_t *fcb = (fsm_fcb_t *) event->data;
fsmdef_dcb_t *dcb = fcb->dcb;
cc_causes_t cause = CC_CAUSE_NORMAL;
int sdpmode = 0;
cc_causes_t lsm_rc;
cc_msgbody_t *part;
uint32_t body_length;
cc_msgbody_info_t msg_body;
FSM_DEBUG_SM(DEB_F_PREFIX"Entered.\n", DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
config_get_value(CFGID_SDPMODE, &sdpmode, sizeof(sdpmode));
if (!sdpmode) {
return (SM_RC_END);
}
if (dcb == NULL) {
FSM_DEBUG_SM(DEB_F_PREFIX"dcb is NULL.\n", DEB_F_PREFIX_ARGS(FSM, __FUNCTION__));
return SM_RC_CLEANUP;
}
return (SM_RC_END);
}
static sm_rcs_t
fsmdef_ev_setpeerconnection(sm_event_t *event) {

14
media/webrtc/signaling/src/sipcc/core/includes/ccapi.h
Просмотреть файл

@ -93,8 +93,6 @@ typedef enum {
CC_FEATURE_CREATEANSWER,
CC_FEATURE_SETLOCALDESC,
CC_FEATURE_SETREMOTEDESC,
CC_FEATURE_LOCALDESC,
CC_FEATURE_REMOTEDESC,
CC_FEATURE_SETPEERCONNECTION,
CC_FEATURE_ADDSTREAM,
CC_FEATURE_REMOVESTREAM,
@ -160,8 +158,6 @@ static const char *const cc_feature_names[] = {
"CREATEANSWER",
"SETLOCALDESC",
"SETREMOTEDESC",
"LOCALDESC",
"REMOTEDESC",
"SETPEERCONNECTION",
"ADDSTREAM",
"REMOVESTREAM",
@ -235,8 +231,6 @@ typedef enum cc_msgs_t_ {
CC_MSG_CREATEANSWER,
CC_MSG_SETLOCALDESC,
CC_MSG_SETREMOTEDESC,
CC_MSG_REMOTEDESC,
CC_MSG_LOCALDESC,
CC_MSG_SETPEERCONNECTION,
CC_MSG_ADDSTREAM,
CC_MSG_REMOVESTREAM,
@ -276,8 +270,6 @@ static const char *const cc_msg_names[] = {
"CREATEANSWER",
"SETLOCALDESC",
"SETREMOTEDESC",
"REMOTEDESC",
"LOCALDESC",
"SETPEERCONNECTION",
"ADDSTREAM",
"REMOVESTREAM",
@ -1196,12 +1188,6 @@ void cc_setlocaldesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line
void cc_setremotedesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
cc_features_t feature_id, cc_jsep_action_t action, string_t sdp, cc_feature_data_t *data);
void cc_localdesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
cc_features_t feature_id, cc_feature_data_t *data);
void cc_remotedesc (cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id, line_t line,
cc_features_t feature_id, cc_feature_data_t *data);
void cc_int_feature_ack(cc_srcs_t src_id, cc_srcs_t dst_id, callid_t call_id,
line_t line, cc_features_t feature_id,
cc_feature_data_t *data, cc_causes_t cause);