From patchwork Mon Jul 7 08:46:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Erlbeck X-Patchwork-Id: 367447 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ganesha.gnumonks.org (ganesha.gnumonks.org [IPv6:2001:780:45:1d:225:90ff:fe52:c662]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A26051400D3 for ; Mon, 7 Jul 2014 18:49:07 +1000 (EST) Received: from localhost ([127.0.0.1] helo=ganesha.gnumonks.org) by ganesha.gnumonks.org with esmtp (Exim 4.72) (envelope-from ) id 1X44bR-0002sH-CW; Mon, 07 Jul 2014 10:48:49 +0200 Received: from mail.sysmocom.de ([144.76.43.93]) by ganesha.gnumonks.org with esmtp (Exim 4.72) (envelope-from ) id 1X44ZC-0002rr-Iv for openbsc@lists.osmocom.org; Mon, 07 Jul 2014 10:46:32 +0200 Received: from sysmocom-tmp.am93.sysmocom.de (91-65-194-134-dynip.superkabel.de [91.65.194.134]) by mail.sysmocom.de (Postfix) with ESMTPSA id 3487D631B2; Mon, 7 Jul 2014 08:46:30 +0000 (UTC) From: Jacob Erlbeck To: openbsc@lists.osmocom.org Subject: [PATCH 2/3] gprs/test: Add connect_sgsn() function Date: Mon, 7 Jul 2014 10:46:00 +0200 Message-Id: <1404722761-25939-2-git-send-email-jerlbeck@sysmocom.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404722761-25939-1-git-send-email-jerlbeck@sysmocom.de> References: <1404386897-27883-1-git-send-email-jerlbeck@sysmocom.de> <1404722761-25939-1-git-send-email-jerlbeck@sysmocom.de> X-Spam-Score: 0.0 (/) Cc: Jacob Erlbeck X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Development of the OpenBSC GSM base station controller List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openbsc-bounces@lists.osmocom.org Errors-To: openbsc-bounces@lists.osmocom.org This function abstracts identical code sequences that are used at multiple places. Sponsored-by: On-Waves ehf --- openbsc/tests/gbproxy/gbproxy_test.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/openbsc/tests/gbproxy/gbproxy_test.c index a8f4eaf..ba1c51b 100644 --- a/openbsc/tests/gbproxy/gbproxy_test.c +++ b/openbsc/tests/gbproxy/gbproxy_test.c @@ -193,6 +193,15 @@ static void setup_bssgp(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr, send_bssgp_reset(nsi, src_addr, bvci); } +static void connect_sgsn(struct gprs_ns_inst *nsi, struct sockaddr_in *sgsn_peer) +{ + gprs_ns_nsip_connect(nsi, sgsn_peer, SGSN_NSEI, SGSN_NSEI+1); + send_ns_reset_ack(nsi, sgsn_peer, SGSN_NSEI+1, SGSN_NSEI); + send_ns_alive_ack(nsi, sgsn_peer); + send_ns_unblock_ack(nsi, sgsn_peer); + send_ns_alive(nsi, sgsn_peer); +} + int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg, struct sockaddr_in *saddr, enum gprs_ns_ll ll); @@ -408,11 +417,7 @@ static void test_gbproxy() printf("--- Initialise SGSN ---\n\n"); - gprs_ns_nsip_connect(nsi, &sgsn_peer, SGSN_NSEI, SGSN_NSEI+1); - send_ns_reset_ack(nsi, &sgsn_peer, SGSN_NSEI+1, SGSN_NSEI); - send_ns_alive_ack(nsi, &sgsn_peer); - send_ns_unblock_ack(nsi, &sgsn_peer); - send_ns_alive(nsi, &sgsn_peer); + connect_sgsn(nsi, &sgsn_peer); gprs_dump_nsi(nsi); printf("--- Initialise BSS 1 ---\n\n"); @@ -569,11 +574,7 @@ static void test_gbproxy_ident_changes() printf("--- Initialise SGSN ---\n\n"); - gprs_ns_nsip_connect(nsi, &sgsn_peer, SGSN_NSEI, SGSN_NSEI+1); - send_ns_reset_ack(nsi, &sgsn_peer, SGSN_NSEI+1, SGSN_NSEI); - send_ns_alive_ack(nsi, &sgsn_peer); - send_ns_unblock_ack(nsi, &sgsn_peer); - send_ns_alive(nsi, &sgsn_peer); + connect_sgsn(nsi, &sgsn_peer); gprs_dump_nsi(nsi); printf("--- Initialise BSS 1 ---\n\n");