cellular-infrastructure
/
osmo-auc
Archived
9
0
Fork 0
Code Releases Activity

gsup_server: Implement IPA CCM handling using new libosmo-abis function

This commit is contained in:
Harald Welte 2016-04-28 08:53:25 +02:00
parent 7e90016009
commit 1b80f77f83
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
osmo-gsup-hlr/src/gsup_server.c
View File

@ -45,7 +45,6 @@ static int osmo_gsup_conn_oap_handle(struct osmo_gsup_conn *conn,
return 0; return 0;
} }
/* Data from a given client has arrived over the socket */ /* Data from a given client has arrived over the socket */
static int osmo_gsup_server_read_cb(struct ipa_server_conn *conn, static int osmo_gsup_server_read_cb(struct ipa_server_conn *conn,
struct msgb *msg) struct msgb *msg)
@ -54,39 +53,18 @@ static int osmo_gsup_server_read_cb(struct ipa_server_conn *conn,
struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg); struct ipaccess_head_ext *he = (struct ipaccess_head_ext *) msgb_l2(msg);
struct osmo_gsup_conn *clnt = (struct osmo_gsup_conn *)conn->data; struct osmo_gsup_conn *clnt = (struct osmo_gsup_conn *)conn->data;
int rc; int rc;
static struct ipaccess_unit ipa_dev = {
.unit_name = "HLR",
/* FIXME */
};
msg->l2h = &hh->data[0]; msg->l2h = &hh->data[0];
/* FIXME: not BTS for server side? */ if (hh->proto == IPAC_PROTO_IPACCESS) {
#if 0 rc = ipa_server_conn_ccm(conn, msg);
rc = ipaccess_bts_handle_ccm(conn, &ipa_dev, msg); if (rc < 0) {
/* conn is already invalid here! */
if (rc < 0) { msgb_free(msg);
LOGP(DLGSUP, LOGL_NOTICE, return -1;
"GSUP received an invalid IPA/CCM message from %s:%d\n",
conn->addr, conn->port);
/* Link has been closed */
clnt->is_connected = 0;
msgb_free(msg);
return -1;
}
if (rc == 1) {
uint8_t msg_type = *(msg->l2h);
/* CCM message */
if (msg_type == IPAC_MSGT_PONG) {
LOGP(DLGSUP, LOGL_DEBUG, "GSUP receiving PONG\n");
clnt->got_ipa_pong = 1;
} }
msgb_free(msg);
return 0; return 0;
} }
#endif
if (hh->proto != IPAC_PROTO_OSMO) if (hh->proto != IPAC_PROTO_OSMO)
goto invalid; goto invalid;
@ -117,6 +95,15 @@ invalid:
} }
static int osmo_gsup_server_ccm_cb(struct ipa_server_conn *conn,
struct msgb *msg, struct tlv_parsed *tlvp,
struct ipaccess_unit *unit)
{
LOGP(DLGSUP, LOGL_INFO, "CCM Callback\n");
/* TODO: ? */
return 0;
}
static int osmo_gsup_server_closed_cb(struct ipa_server_conn *conn) static int osmo_gsup_server_closed_cb(struct ipa_server_conn *conn)
{ {
struct osmo_gsup_conn *clnt = (struct osmo_gsup_conn *)conn->data; struct osmo_gsup_conn *clnt = (struct osmo_gsup_conn *)conn->data;
@ -135,6 +122,7 @@ static int osmo_gsup_server_accept_cb(struct ipa_server_link *link, int fd)
struct osmo_gsup_conn *conn; struct osmo_gsup_conn *conn;
struct osmo_gsup_server *gsups = struct osmo_gsup_server *gsups =
(struct osmo_gsup_server *) link->data; (struct osmo_gsup_server *) link->data;
int rc;
conn = talloc_zero(link->data, struct osmo_gsup_conn); conn = talloc_zero(link->data, struct osmo_gsup_conn);
OSMO_ASSERT(conn); OSMO_ASSERT(conn);
@ -142,6 +130,7 @@ static int osmo_gsup_server_accept_cb(struct ipa_server_link *link, int fd)
conn->conn = ipa_server_conn_create(conn, link, fd, conn->conn = ipa_server_conn_create(conn, link, fd,
osmo_gsup_server_read_cb, osmo_gsup_server_read_cb,
osmo_gsup_server_closed_cb, conn); osmo_gsup_server_closed_cb, conn);
conn->conn->ccm_cb = osmo_gsup_server_ccm_cb;
OSMO_ASSERT(conn->conn); OSMO_ASSERT(conn->conn);
/* link data structure with server structure */ /* link data structure with server structure */
@ -150,13 +139,20 @@ static int osmo_gsup_server_accept_cb(struct ipa_server_link *link, int fd)
LOGP(DLGSUP, LOGL_INFO, "New GSUP client %s:%d\n", LOGP(DLGSUP, LOGL_INFO, "New GSUP client %s:%d\n",
conn->conn->addr, conn->conn->port); conn->conn->addr, conn->conn->port);
/* request the identity of the client */
rc = ipa_ccm_send_id_req(fd);
if (rc < 0)
goto failed;
#if 0 #if 0
rc = oap_init(&gsups->oap_config, &conn->oap_state); rc = oap_init(&gsups->oap_config, &conn->oap_state);
if (rc != 0) if (rc != 0)
goto failed; goto failed;
failed:
#endif #endif
return 0; return 0;
failed:
ipa_server_conn_destroy(conn->conn);
return -1;
} }
struct osmo_gsup_server * struct osmo_gsup_server *