From 049eb23b73c0827936888aa555c5eb9866f9ef27 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 31 May 2010 12:54:23 +0200
Subject: [GPRS] Make sure SI13 rest octets look like those of the ip.access
 BSC

---
 openbsc/src/rest_octets.c        | 12 ++++++++++--
 openbsc/src/system_information.c | 14 +++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'openbsc')

diff --git a/openbsc/src/rest_octets.c b/openbsc/src/rest_octets.c
index 039d2c83a..d9f5da568 100644
--- a/openbsc/src/rest_octets.c
+++ b/openbsc/src/rest_octets.c
@@ -316,8 +316,16 @@ static int append_gprs_cell_opt(struct bitvec *bv,
 	bitvec_set_bit(bv, 1);
 	bitvec_set_uint(bv, gco->bs_cv_max, 4);
 
-	/* hard-code no PAN_{DEC,INC,MAX} */
-	bitvec_set_bit(bv, 0);
+	if (0) {
+		/* hard-code no PAN_{DEC,INC,MAX} */
+		bitvec_set_bit(bv, 0);
+	} else {
+		/* copied from ip.access BSC protocol trace */
+		bitvec_set_bit(bv, 1);
+		bitvec_set_uint(bv, 1, 3);	/* DEC */
+		bitvec_set_uint(bv, 1, 3);	/* INC */
+		bitvec_set_uint(bv, 15, 3);	/* MAX */
+	}
 
 	if (!gco->ext_info_present) {
 		/* no extension information */
diff --git a/openbsc/src/system_information.c b/openbsc/src/system_information.c
index 3bd833a93..6e1807904 100644
--- a/openbsc/src/system_information.c
+++ b/openbsc/src/system_information.c
@@ -398,16 +398,16 @@ static int generate_si6(u_int8_t *output, struct gsm_bts *bts)
 static struct gsm48_si13_info si13_default = {
 	.cell_opts = {
 		.nmo 		= GPRS_NMO_III,
-		.t3168		= 1500,
-		.t3192		= 500,
+		.t3168		= 2000,
+		.t3192		= 200,
 		.drx_timer_max	= 3,
 		.bs_cv_max	= 15,
-		.ext_info_present = 0,
+		.ext_info_present = 1,
 		.ext_info = {
 			/* The values below are just guesses ! */
 			.egprs_supported = 0,
 			.use_egprs_p_ch_req = 1,
-			.bep_period = 4,
+			.bep_period = 5,
 			.pfc_supported = 0,
 			.dtm_supported = 0,
 			.bss_paging_coordination = 0,
@@ -415,10 +415,10 @@ static struct gsm48_si13_info si13_default = {
 	},
 	.pwr_ctrl_pars = {
 		.alpha		= 10,	/* a = 1.0 */
-		.t_avg_w	= 25,
-		.t_avg_t	= 25,
+		.t_avg_w	= 16,
+		.t_avg_t	= 16,
 		.pc_meas_chan	= 0, 	/* downling measured on CCCH */
-		.n_avg_i	= 15,
+		.n_avg_i	= 8,
 	},
 	.bcch_change_mark	= 1,
 	.si_change_field	= 0,
-- 
cgit v1.2.3