UE/EMM/LowerLayer: move ueid to nas_user_t

This commit is contained in:
Frédéric Leroy
2017-01-25 13:24:30 +01:00
parent e6daacf7ea
commit c7a36ec6d2
6 changed files with 21 additions and 24 deletions
+5 -5
View File
@@ -446,18 +446,18 @@ static int _emm_as_data_ind(nas_user_t *user, const emm_as_data_t *msg, int *emm
EPS_SESSION_MANAGEMENT_MESSAGE) {
const OctetString data = {bytes, (uint8_t *)plain_msg};
/* Foward ESM data to EPS session management */
rc = lowerlayer_data_ind(user, msg->ueid, &data);
rc = lowerlayer_data_ind(user, &data);
}
free(plain_msg);
}
} else {
/* Process successfull lower layer transfer indication */
rc = lowerlayer_success(user, msg->ueid);
rc = lowerlayer_success(user);
}
} else {
/* Process lower layer transmission failure of NAS message */
rc = lowerlayer_failure(user, msg->ueid);
rc = lowerlayer_failure(user);
}
LOG_FUNC_RETURN (rc);
@@ -496,7 +496,7 @@ static int _emm_as_establish_cnf(nas_user_t *user, const emm_as_establish_t *msg
} else {
/* The initial NAS message has been successfully delivered to
* lower layers */
rc = lowerlayer_success(user, 0);
rc = lowerlayer_success(user);
LOG_FUNC_RETURN (rc);
}
@@ -571,7 +571,7 @@ static int _emm_as_establish_rej(nas_user_t *user)
"failure");
/* Process lower layer transmission failure of initial NAS message */
rc = lowerlayer_failure(user, 0);
rc = lowerlayer_failure(user);
LOG_FUNC_RETURN (rc);
}
+1 -1
View File
@@ -149,7 +149,7 @@ int emm_esm_send(nas_user_t *user, const emm_esm_t *msg)
case _EMMESM_UNITDATA_REQ:
/* ESM requests EMM to transfer ESM data unit to lower layer */
rc = lowerlayer_data_req(user, msg->ueid, &msg->u.data.msg);
rc = lowerlayer_data_req(user, &msg->u.data.msg);
break;
default: