[SGSN] Add VTY interface for SNDCP
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index 30b45f6..9687090 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -19,7 +19,7 @@
$(top_srcdir)/src/socket.c $(top_srcdir)/src/debug.c
osmo_gbproxy_LDADD = libgb.a $(top_builddir)/src/libvty.a
-osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c \
+osmo_sgsn_SOURCES = gprs_gmm.c gprs_sgsn.c gprs_sndcp.c gprs_sndcp_vty.c \
sgsn_main.c sgsn_vty.c sgsn_libgtp.c \
$(top_srcdir)/src/socket.c $(top_srcdir)/src/debug.c
osmo_sgsn_LDADD = libgb.a $(top_builddir)/src/libvty.a -lgtp
diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c
index 8433326..3b6ca96 100644
--- a/openbsc/src/gprs/gprs_sndcp.c
+++ b/openbsc/src/gprs/gprs_sndcp.c
@@ -35,6 +35,8 @@
#include <openbsc/gprs_llc.h>
#include <openbsc/sgsn.h>
+#include "gprs_sndcp.h"
+
/* Chapter 7.2: SN-PDU Formats */
struct sndcp_common_hdr {
/* octet 1 */
@@ -60,13 +62,6 @@
uint8_t npdu_low;
} __attribute__((packed));
-/* See 6.7.1.2 Reassembly */
-enum sndcp_rx_state {
- SNDCP_RX_S_FIRST,
- SNDCP_RX_S_SUBSEQ,
- SNDCP_RX_S_DISCARD,
-};
-
static void *tall_sndcp_ctx;
@@ -81,45 +76,10 @@
uint8_t *data;
};
-/* A fragment queue header, maintaining list of fragments for one N-PDU */
-struct defrag_state {
- /* PDU number for which the defragmentation state applies */
- uint16_t npdu;
- /* highest segment number we have received so far */
- uint8_t highest_seg;
- /* bitmask of the segments we already have */
- uint32_t seg_have;
- /* do we still expect more segments? */
- unsigned int no_more;
- /* total length of all segments together */
- unsigned int tot_len;
-
- /* linked list of defrag_queue_entry: one for each fragment */
- struct llist_head frag_list;
-
- struct timer_list timer;
-};
-
-struct sndcp_entity {
- struct llist_head list;
-
- /* reference to the LLC Entity below this SNDCP entity */
- struct gprs_llc_lle *lle;
- /* The NSAPI we shall use on top of LLC */
- uint8_t nsapi;
-
- /* NPDU number for the GTP->SNDCP side */
- uint16_t tx_npdu_nr;
- /* SNDCP eeceiver state */
- enum sndcp_rx_state rx_state;
- /* The defragmentation queue */
- struct defrag_state defrag;
-};
-
-LLIST_HEAD(sndcp_entities);
+LLIST_HEAD(gprs_sndcp_entities);
/* Enqueue a fragment into the defragment queue */
-static int defrag_enqueue(struct sndcp_entity *sne, uint8_t seg_nr,
+static int defrag_enqueue(struct gprs_sndcp_entity *sne, uint8_t seg_nr,
uint32_t data_len, uint8_t *data)
{
struct defrag_queue_entry *dqe;
@@ -147,7 +107,7 @@
}
/* return if we have all segments of this N-PDU */
-static int defrag_have_all_segments(struct sndcp_entity *sne)
+static int defrag_have_all_segments(struct gprs_sndcp_entity *sne)
{
uint32_t seg_needed = 0;
unsigned int i;
@@ -162,7 +122,7 @@
return 0;
}
-static struct defrag_queue_entry *defrag_get_seg(struct sndcp_entity *sne,
+static struct defrag_queue_entry *defrag_get_seg(struct gprs_sndcp_entity *sne,
uint32_t seg_nr)
{
struct defrag_queue_entry *dqe;
@@ -176,7 +136,7 @@
return NULL;
}
-static int defrag_segments(struct sndcp_entity *sne)
+static int defrag_segments(struct gprs_sndcp_entity *sne)
{
struct msgb *msg;
unsigned int seg_nr;
@@ -214,7 +174,7 @@
sne->defrag.tot_len, npdu);
}
-static int defrag_input(struct sndcp_entity *sne, struct msgb *msg, uint8_t *hdr)
+static int defrag_input(struct gprs_sndcp_entity *sne, struct msgb *msg, uint8_t *hdr)
{
struct sndcp_common_hdr *sch;
struct sndcp_comp_hdr *scomph = NULL;
@@ -279,24 +239,24 @@
return 0;
}
-static struct sndcp_entity *sndcp_entity_by_lle(const struct gprs_llc_lle *lle,
+static struct gprs_sndcp_entity *gprs_sndcp_entity_by_lle(const struct gprs_llc_lle *lle,
uint8_t nsapi)
{
- struct sndcp_entity *sne;
+ struct gprs_sndcp_entity *sne;
- llist_for_each_entry(sne, &sndcp_entities, list) {
+ llist_for_each_entry(sne, &gprs_sndcp_entities, list) {
if (sne->lle == lle && sne->nsapi == nsapi)
return sne;
}
return NULL;
}
-static struct sndcp_entity *sndcp_entity_alloc(struct gprs_llc_lle *lle,
+static struct gprs_sndcp_entity *gprs_sndcp_entity_alloc(struct gprs_llc_lle *lle,
uint8_t nsapi)
{
- struct sndcp_entity *sne;
+ struct gprs_sndcp_entity *sne;
- sne = talloc_zero(tall_sndcp_ctx, struct sndcp_entity);
+ sne = talloc_zero(tall_sndcp_ctx, struct gprs_sndcp_entity);
if (!sne)
return NULL;
@@ -306,7 +266,7 @@
//sne->fqueue.timer.cb = FIXME;
sne->rx_state = SNDCP_RX_S_FIRST;
- llist_add(&sne->list, &sndcp_entities);
+ llist_add(&sne->list, &gprs_sndcp_entities);
return sne;
}
@@ -317,14 +277,14 @@
LOGP(DSNDCP, LOGL_INFO, "SNSM-ACTIVATE.ind (lle=%p TLLI=%08x, "
"SAPI=%u, NSAPI=%u)\n", lle, lle->llme->tlli, lle->sapi, nsapi);
- if (sndcp_entity_by_lle(lle, nsapi)) {
+ if (gprs_sndcp_entity_by_lle(lle, nsapi)) {
LOGP(DSNDCP, LOGL_ERROR, "Trying to ACTIVATE "
"already-existing entity (TLLI=%08x, NSAPI=%u)\n",
lle->llme->tlli, nsapi);
return -EEXIST;
}
- if (!sndcp_entity_alloc(lle, nsapi)) {
+ if (!gprs_sndcp_entity_alloc(lle, nsapi)) {
LOGP(DSNDCP, LOGL_ERROR, "Out of memory during ACTIVATE\n");
return -ENOMEM;
}
@@ -335,12 +295,12 @@
/* Entry point for the SNSM-DEACTIVATE.indication */
int sndcp_sm_deactivate_ind(struct gprs_llc_lle *lle, uint8_t nsapi)
{
- struct sndcp_entity *sne;
+ struct gprs_sndcp_entity *sne;
LOGP(DSNDCP, LOGL_INFO, "SNSM-DEACTIVATE.ind (lle=%p, TLLI=%08x, "
"SAPI=%u, NSAPI=%u)\n", lle, lle->llme->tlli, lle->sapi, nsapi);
- sne = sndcp_entity_by_lle(lle, nsapi);
+ sne = gprs_sndcp_entity_by_lle(lle, nsapi);
if (!sne) {
LOGP(DSNDCP, LOGL_ERROR, "SNSM-DEACTIVATE.ind for non-"
"existing TLLI=%08x SAPI=%u NSAPI=%u\n", lle->llme->tlli,
@@ -361,14 +321,14 @@
struct msgb *msg; /* original message */
uint8_t *next_byte; /* first byte of next fragment */
- struct sndcp_entity *sne;
+ struct gprs_sndcp_entity *sne;
void *mmcontext;
};
/* returns '1' if there are more fragments to send, '0' if none */
static int sndcp_send_ud_frag(struct sndcp_frag_state *fs)
{
- struct sndcp_entity *sne = fs->sne;
+ struct gprs_sndcp_entity *sne = fs->sne;
struct gprs_llc_lle *lle = sne->lle;
struct sndcp_common_hdr *sch;
struct sndcp_comp_hdr *scomph;
@@ -462,7 +422,7 @@
int sndcp_unitdata_req(struct msgb *msg, struct gprs_llc_lle *lle, uint8_t nsapi,
void *mmcontext)
{
- struct sndcp_entity *sne;
+ struct gprs_sndcp_entity *sne;
struct sndcp_common_hdr *sch;
struct sndcp_comp_hdr *scomph;
struct sndcp_udata_hdr *suh;
@@ -470,7 +430,7 @@
/* Identifiers from UP: (TLLI, SAPI) + (BVCI, NSEI) */
- sne = sndcp_entity_by_lle(lle, nsapi);
+ sne = gprs_sndcp_entity_by_lle(lle, nsapi);
if (!sne) {
LOGP(DSNDCP, LOGL_ERROR, "Cannot find SNDCP Entity\n");
return -EIO;
@@ -524,7 +484,7 @@
/* Section 5.1.2.17 LL-UNITDATA.ind */
int sndcp_llunitdata_ind(struct msgb *msg, struct gprs_llc_lle *lle, uint8_t *hdr, uint8_t len)
{
- struct sndcp_entity *sne;
+ struct gprs_sndcp_entity *sne;
struct sndcp_common_hdr *sch = (struct sndcp_common_hdr *)hdr;
struct sndcp_comp_hdr *scomph = NULL;
struct sndcp_udata_hdr *suh;
@@ -549,7 +509,7 @@
return -EIO;
}
- sne = sndcp_entity_by_lle(lle, sch->nsapi);
+ sne = gprs_sndcp_entity_by_lle(lle, sch->nsapi);
if (!sne) {
LOGP(DSNDCP, LOGL_ERROR, "Message for non-existing SNDCP Entity "
"(lle=%p, TLLI=%08x, SAPI=%u, NSAPI=%u)\n", lle,
@@ -558,9 +518,13 @@
}
if (!sch->first || sch->more) {
+#if 0
/* FIXME: implement fragment re-assembly */
LOGP(DSNDCP, LOGL_ERROR, "We don't support reassembly yet\n");
return -EIO;
+#else
+ return defrag_input(sne, msg, hdr);
+#endif
}
if (scomph && (scomph->pcomp || scomph->dcomp)) {
@@ -581,7 +545,7 @@
}
/* Section 5.1.2.1 LL-RESET.ind */
-static int sndcp_ll_reset_ind(struct sndcp_entity *se)
+static int sndcp_ll_reset_ind(struct gprs_sndcp_entity *se)
{
/* treat all outstanding SNDCP-LLC request type primitives as not sent */
/* reset all SNDCP XID parameters to default values */
@@ -596,7 +560,7 @@
static struct sndcp_state_list {{
uint32_t states;
unsigned int type;
- int (*rout)(struct sndcp_entity *se, struct msgb *msg);
+ int (*rout)(struct gprs_sndcp_entity *se, struct msgb *msg);
} sndcp_state_list[] = {
{ ALL_STATES,
LL_RESET_IND, sndcp_ll_reset_ind },
diff --git a/openbsc/src/gprs/gprs_sndcp.h b/openbsc/src/gprs/gprs_sndcp.h
new file mode 100644
index 0000000..6c7c834
--- /dev/null
+++ b/openbsc/src/gprs/gprs_sndcp.h
@@ -0,0 +1,51 @@
+#ifndef _INT_SNDCP_H
+#define _INT_SNDCP_H
+
+#include <stdint.h>
+#include <osmocore/linuxlist.h>
+
+/* A fragment queue header, maintaining list of fragments for one N-PDU */
+struct defrag_state {
+ /* PDU number for which the defragmentation state applies */
+ uint16_t npdu;
+ /* highest segment number we have received so far */
+ uint8_t highest_seg;
+ /* bitmask of the segments we already have */
+ uint32_t seg_have;
+ /* do we still expect more segments? */
+ unsigned int no_more;
+ /* total length of all segments together */
+ unsigned int tot_len;
+
+ /* linked list of defrag_queue_entry: one for each fragment */
+ struct llist_head frag_list;
+
+ struct timer_list timer;
+};
+
+/* See 6.7.1.2 Reassembly */
+enum sndcp_rx_state {
+ SNDCP_RX_S_FIRST,
+ SNDCP_RX_S_SUBSEQ,
+ SNDCP_RX_S_DISCARD,
+};
+
+struct gprs_sndcp_entity {
+ struct llist_head list;
+
+ /* reference to the LLC Entity below this SNDCP entity */
+ struct gprs_llc_lle *lle;
+ /* The NSAPI we shall use on top of LLC */
+ uint8_t nsapi;
+
+ /* NPDU number for the GTP->SNDCP side */
+ uint16_t tx_npdu_nr;
+ /* SNDCP eeceiver state */
+ enum sndcp_rx_state rx_state;
+ /* The defragmentation queue */
+ struct defrag_state defrag;
+};
+
+extern struct llist_head gprs_sndcp_entities;
+
+#endif /* INT_SNDCP_H */
diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/openbsc/src/gprs/gprs_sndcp_vty.c
new file mode 100644
index 0000000..adca372
--- /dev/null
+++ b/openbsc/src/gprs/gprs_sndcp_vty.c
@@ -0,0 +1,75 @@
+/* VTY interface for our GPRS SNDCP implementation */
+
+/* (C) 2010 by Harald Welte <laforge@gnumonks.org>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdint.h>
+
+#include <arpa/inet.h>
+
+#include <openbsc/gsm_data.h>
+#include <osmocore/msgb.h>
+#include <osmocore/tlv.h>
+#include <osmocore/talloc.h>
+#include <osmocore/select.h>
+#include <osmocore/rate_ctr.h>
+#include <openbsc/debug.h>
+#include <openbsc/signal.h>
+#include <openbsc/gprs_llc.h>
+
+#include "gprs_sndcp.h"
+
+#include <osmocom/vty/vty.h>
+#include <osmocom/vty/command.h>
+
+static void vty_dump_sne(struct vty *vty, struct gprs_sndcp_entity *sne)
+{
+ unsigned int i;
+
+ vty_out(vty, " TLLI %08x SAPI=%u NSAPI=%u:%s",
+ sne->lle->llme->tlli, sne->lle->sapi, sne->nsapi, VTY_NEWLINE);
+ vty_out(vty, " Defrag: npdu=%u highest_seg=%u seg_have=0x%08x tot_len=%u%s",
+ sne->defrag.npdu, sne->defrag.highest_seg, sne->defrag.seg_have,
+ sne->defrag.tot_len, VTY_NEWLINE);
+}
+
+
+DEFUN(show_sndcp, show_sndcp_cmd,
+ "show sndcp",
+ SHOW_STR "Display information about the SNDCP protocol")
+{
+ struct gprs_sndcp_entity *sne;
+
+ vty_out(vty, "State of SNDCP Entities%s", VTY_NEWLINE);
+ llist_for_each_entry(sne, &gprs_sndcp_entities, list)
+ vty_dump_sne(vty, sne);
+
+ return CMD_SUCCESS;
+}
+
+int gprs_sndcp_vty_init(void)
+{
+ install_element_ve(&show_sndcp_cmd);
+
+ return 0;
+}
diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c
index 27d156a..2647867 100644
--- a/openbsc/src/gprs/sgsn_main.c
+++ b/openbsc/src/gprs/sgsn_main.c
@@ -173,6 +173,7 @@
gprs_ns_vty_init(bssgp_nsi);
gprs_bssgp_vty_init();
gprs_llc_vty_init();
+ gprs_sndcp_vty_init();
/* FIXME: register signal handler for SS_NS */
rc = sgsn_parse_config(sgsn_inst.config_file, &sgsn_inst.cfg);