comparison src/aci2/alr/alr_dedi.c @ 214:4d622fd5e701

src/aci2/alr/alr_dedi.c: hopefully last A5/3 bug fixed, AMR works now!
author Mychaela Falconia <falcon@freecalypso.org>
date Sat, 15 Oct 2016 02:59:36 +0000
parents 93999a60b835
children
comparison
equal deleted inserted replaced
213:7fef2fc6e002 214:4d622fd5e701
883 chan_ass->channel_desc_1_bef_sti.tsc = 883 chan_ass->channel_desc_1_bef_sti.tsc =
884 dedicated_req->ch_type2.tsc; 884 dedicated_req->ch_type2.tsc;
885 } 885 }
886 chan_ass->cipher_mode = dedicated_req->ciph.stat; 886 chan_ass->cipher_mode = dedicated_req->ciph.stat;
887 chan_ass->a5_algorithm = dedicated_req->ciph.algo; 887 chan_ass->a5_algorithm = dedicated_req->ciph.algo;
888 memcpy (&chan_ass->cipher_key, dedicated_req->ciph.kc, KC_STRING_SIZE); 888 memcpy (&chan_ass->cipher_key, dedicated_req->ciph.kc, sizeof(T_cipher_key));
889 chan_ass->dtx_allowed = dedicated_req->tr_para.dtx; 889 chan_ass->dtx_allowed = dedicated_req->tr_para.dtx;
890 890
891 /* 891 /*
892 * store the new configuration as temporary configuration 892 * store the new configuration as temporary configuration
893 */ 893 */
1102 async->handover_command.channel_desc_1_bef_sti.timeslot_no = dedicated_req->ch_type2.tn; 1102 async->handover_command.channel_desc_1_bef_sti.timeslot_no = dedicated_req->ch_type2.tn;
1103 async->handover_command.channel_desc_1_bef_sti.tsc = dedicated_req->ch_type2.tsc; 1103 async->handover_command.channel_desc_1_bef_sti.tsc = dedicated_req->ch_type2.tsc;
1104 } 1104 }
1105 async->handover_command.cipher_mode = dedicated_req->ciph.stat; 1105 async->handover_command.cipher_mode = dedicated_req->ciph.stat;
1106 async->handover_command.a5_algorithm = dedicated_req->ciph.algo; 1106 async->handover_command.a5_algorithm = dedicated_req->ciph.algo;
1107 memcpy (&async->cipher_key, dedicated_req->ciph.kc, KC_STRING_SIZE); 1107 memcpy (&async->cipher_key, dedicated_req->ciph.kc, sizeof(T_cipher_key));
1108 1108
1109 /* 1109 /*
1110 * store the new parameters as temporary configuration. 1110 * store the new parameters as temporary configuration.
1111 */ 1111 */
1112 alr_data->dedi_data.temp_bcch = dedicated_req->arfcn; 1112 alr_data->dedi_data.temp_bcch = dedicated_req->arfcn;
1306 sync->handover_command.channel_desc_1_bef_sti.tsc = 1306 sync->handover_command.channel_desc_1_bef_sti.tsc =
1307 dedicated_req->ch_type2.tsc; 1307 dedicated_req->ch_type2.tsc;
1308 } 1308 }
1309 sync->handover_command.cipher_mode = dedicated_req->ciph.stat; 1309 sync->handover_command.cipher_mode = dedicated_req->ciph.stat;
1310 sync->handover_command.a5_algorithm = dedicated_req->ciph.algo; 1310 sync->handover_command.a5_algorithm = dedicated_req->ciph.algo;
1311 memcpy (&sync->cipher_key, dedicated_req->ciph.kc, KC_STRING_SIZE); 1311 memcpy (&sync->cipher_key, dedicated_req->ciph.kc, sizeof(T_cipher_key));
1312 1312
1313 /* 1313 /*
1314 * store the new values as temporary configuration 1314 * store the new values as temporary configuration
1315 */ 1315 */
1316 alr_data->dedi_data.temp_bcch = dedicated_req->arfcn; 1316 alr_data->dedi_data.temp_bcch = dedicated_req->arfcn;
1481 presync->handover_command.channel_desc_1_bef_sti.tsc = 1481 presync->handover_command.channel_desc_1_bef_sti.tsc =
1482 dedicated_req->ch_type2.tsc; 1482 dedicated_req->ch_type2.tsc;
1483 } 1483 }
1484 presync->handover_command.cipher_mode = dedicated_req->ciph.stat; 1484 presync->handover_command.cipher_mode = dedicated_req->ciph.stat;
1485 presync->handover_command.a5_algorithm = dedicated_req->ciph.algo; 1485 presync->handover_command.a5_algorithm = dedicated_req->ciph.algo;
1486 memcpy (&presync->cipher_key, dedicated_req->ciph.kc, KC_STRING_SIZE); 1486 memcpy (&presync->cipher_key, dedicated_req->ciph.kc, sizeof(T_cipher_key));
1487 1487
1488 /* 1488 /*
1489 * store the new parameters as temporary configuration. 1489 * store the new parameters as temporary configuration.
1490 */ 1490 */
1491 alr_data->dedi_data.temp_bcch = dedicated_req->arfcn; 1491 alr_data->dedi_data.temp_bcch = dedicated_req->arfcn;
1689 /* 1689 /*
1690 * convert the parameters to the layer 1 structure 1690 * convert the parameters to the layer 1 structure
1691 */ 1691 */
1692 set_ciph->cipher_mode = ciph_req->ciph.stat; 1692 set_ciph->cipher_mode = ciph_req->ciph.stat;
1693 set_ciph->a5_algorithm = ciph_req->ciph.algo; 1693 set_ciph->a5_algorithm = ciph_req->ciph.algo;
1694 memcpy (set_ciph->new_ciph_param.A, ciph_req->ciph.kc, KC_STRING_SIZE); 1694 memcpy (set_ciph->new_ciph_param.A, ciph_req->ciph.kc, sizeof(T_cipher_key));
1695 1695
1696 alr_data->dedi_data.act_cipher_mode = set_ciph->cipher_mode; 1696 alr_data->dedi_data.act_cipher_mode = set_ciph->cipher_mode;
1697 alr_data->dedi_data.act_a5_algorithm = set_ciph->a5_algorithm; 1697 alr_data->dedi_data.act_a5_algorithm = set_ciph->a5_algorithm;
1698 memcpy (&alr_data->dedi_data.act_cipher_key, 1698 memcpy (&alr_data->dedi_data.act_cipher_key,
1699 &set_ciph->new_ciph_param, KC_STRING_SIZE); 1699 &set_ciph->new_ciph_param, sizeof(T_cipher_key));
1700 1700
1701 /* 1701 /*
1702 * forward the parameters to layer 1 1702 * forward the parameters to layer 1
1703 */ 1703 */
1704 ma_dedi_ciph_req (set_ciph); 1704 ma_dedi_ciph_req (set_ciph);