cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

mgcp: Implement RSIP based on a trunk level 

Implement the RSIP spec extension to work on the specified
trunk instead of hardcoding it to the virtual trunk.
This commit is contained in:
Holger Hans Peter Freyther 2011-06-10 00:04:55 +02:00
parent 9b9a171da9
commit 74db7744ee
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/mgcp.h
View File

@ -82,7 +82,7 @@ struct mgcp_trunk_config;
typedef int (*mgcp_realloc)(struct mgcp_trunk_config *cfg, int endpoint);
typedef int (*mgcp_change)(struct mgcp_trunk_config *cfg, int endpoint, int state);
typedef int (*mgcp_policy)(struct mgcp_trunk_config *cfg, int endpoint, int state, const char *transactio_id);
typedef int (*mgcp_reset)(struct mgcp_config *cfg);
typedef int (*mgcp_reset)(struct mgcp_trunk_config *cfg);
#define PORT_ALLOC_STATIC 0
#define PORT_ALLOC_DYNAMIC 1

14
openbsc/src/libmgcp/mgcp_protocol.c
View File

@ -831,8 +831,20 @@ out_silent:
static struct msgb *handle_rsip(struct mgcp_config *cfg, struct msgb *msg)
{
struct mgcp_msg_ptr data_ptrs[6];
const char *trans_id;
struct mgcp_endpoint *endp;
int found;
found = mgcp_analyze_header(cfg, msg, data_ptrs, ARRAY_SIZE(data_ptrs),
&trans_id, &endp);
if (found != 0) {
LOGP(DMGCP, LOGL_ERROR, "Failed to find the endpoint.\n");
return NULL;
}
if (cfg->reset_cb)
cfg->reset_cb(cfg);
cfg->reset_cb(endp->tcfg);
return NULL;
}

16
openbsc/src/osmo-bsc_mgcp/mgcp_main.c
View File

@ -2,8 +2,8 @@
/* The main method to drive it as a standalone process */
/*
* (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2009 by On-Waves
* (C) 2009-2011 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2009-2011 by On-Waves
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@ -58,6 +58,7 @@ void subscr_put() { abort(); }
#warning "Make use of the rtp proxy code"
static struct mgcp_config *cfg;
static struct mgcp_trunk_config *reset_trunk;
static int reset_endpoints = 0;
static int daemonize = 0;
@ -121,9 +122,10 @@ static void handle_options(int argc, char **argv)
}
/* simply remember this */
static int mgcp_rsip_cb(struct mgcp_config *cfg)
static int mgcp_rsip_cb(struct mgcp_trunk_config *tcfg)
{
reset_endpoints = 1;
reset_trunk = tcfg;
return 0;
}
@ -170,12 +172,14 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what)
}
if (reset_endpoints) {
LOGP(DMGCP, LOGL_NOTICE, "Asked to reset endpoints.\n");
LOGP(DMGCP, LOGL_NOTICE,
"Asked to reset endpoints: %d/%d\n",
reset_trunk->trunk_nr, reset_trunk->trunk_type);
reset_endpoints = 0;
/* is checking in_addr.s_addr == INADDR_LOOPBACK making it more secure? */
for (i = 1; i < cfg->trunk.number_endpoints; ++i)
mgcp_free_endp(&cfg->trunk.endpoints[i]);
for (i = 1; i < reset_trunk->number_endpoints; ++i)
mgcp_free_endp(&reset_trunk->endpoints[i]);
}
return 0;