[gsm] Make LCR work with current Osmocom-BB.

[lcr.git] / gsm.h

diff --git a/gsm.h b/gsm.h
index 5080a8a..c12baa0 100644 (file)
--- a/gsm.h
+++ b/gsm.h
@@ -1,16 +1,7 @@
-extern int new_callref;
 
-struct gsm_conf {
-       char debug[128];                /* debug info */
-       char openbsc_cfg[128];          /* openbsc config file */
-       char short_name[64];            /* short network name */
-       char long_name[64];             /* long network name */
-       char hlr[64];                   /* database name */
-       int allow_all;                  /* accept unknown subscribers */
-       int keep_l2;                    /* keep layer 2 after exit */
-       char pcapfile[128];             /* open capture file for BS11 links */
-       int reject_cause;               /* reject cause for unsubcribed IMSIs */
-};
+#include <sys/un.h>
+
+extern int new_callref;
 
 struct mncc_q_entry {
        struct mncc_q_entry *next;
@@ -20,13 +11,12 @@ struct mncc_q_entry {
 
 struct lcr_gsm {
        void            *network;       /* OpenBSC network handle */
-       struct gsm_conf conf;           /* gsm.conf options */
-       int             gsm_sock;       /* loopback interface GSM side */
-       int             gsm_port;       /* loopback interface port number */
 
        struct lcr_fd   mncc_lfd;       /* Unix domain socket to OpenBSC MNCC */
        struct mncc_q_entry *mncc_q_hd;
        struct mncc_q_entry *mncc_q_tail;
+       struct lcr_timer socket_retry;  /* Timer to re-try connecting to BSC socket */
+       struct sockaddr_un sun;         /* Socket address of MNCC socket */
 };
 
 extern struct lcr_gsm *gsm;
@@ -85,6 +75,3 @@ int gsm_conf(struct gsm_conf *gsm_conf, char *conf_error);
 int gsm_exit(int rc);
 int gsm_init(void);
 
-extern "C" {
-int mncc_send(struct gsm_network *instance, int msg_type, void *data);
-};