diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-03-15 02:49:18 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-04-08 16:26:28 +0200 |
| commit | 58cf1b1f66ee20ca42ad2af064ab2bcc5f03f653 (patch) | |
| tree | 3d04ef8abd18d635b4a012ffaf1f780bdebd18ce /src/osmo-bsc/handover_fsm.c | |
| parent | e94ce889f011b15f7f98b16ae4ddb2123c7c9b0f (diff) | |
lchan activation: add explicit encryption info to activation
For intra-BSC handover, the previous encryption is copied from the old lchan,
which of course is not available during inter-BSC handover. Hence the lchan
activation info needs to include an explicit encryption information, and we
must not rely on the presence of the previous lchan to copy encryption
information from.
Add struct lchan_activate_info.encr to allow passing encryption info through
lchan_activate() without requiring a previous struct gsm_lchan to be present.
Instead of copying from the old lchan, always copy encryption info to
lchan_activate_info, and during activation, just before sending the Channel
Activation, copy the lchan_activate_info.encr to the new lchan.
This prepares for upcoming I5b269f50bd2092516bfdf87746196983d3ac49d1 which
obtains the encryption information from an intra-BSC-incoming Handover Request
message.
Related: OS#3842
Related: I5b269f50bd2092516bfdf87746196983d3ac49d1
Change-Id: Ib3d259a5711add65ab7298bfa3977855a17a1642
Diffstat (limited to 'src/osmo-bsc/handover_fsm.c')
| -rw-r--r-- | src/osmo-bsc/handover_fsm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index a3d25d629..9c86b7090 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -358,6 +358,7 @@ static void handover_start_intra_bsc(struct gsm_subscriber_connection *conn) .activ_for = FOR_HANDOVER, .for_conn = conn, .chan_mode = conn->lchan->tch_mode, + .encr = conn->lchan->encr, .requires_voice_stream = conn->lchan->mgw_endpoint_ci_bts ? true : false, .msc_assigned_cic = conn->ho.inter_bsc_in.msc_assigned_cic, .re_use_mgw_endpoint_from_lchan = conn->lchan, |