cellular-infrastructure
/
cellmgr-ng
Archived
9
0
Fork 0
Code Releases Activity

mgcp: Use uint32_t for the CI in every place.

This commit is contained in:
Holger Hans Peter Freyther 2010-08-08 07:51:51 +08:00
parent 7b7c297c8f
commit 5b08401701
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mgcp/mgcp.h
View File

@ -107,7 +107,7 @@ struct mgcp_config {
void *data;
struct mgcp_endpoint *endpoints;
unsigned int last_call_id;
uint32_t last_call_id;
};
/* config management */

2
include/mgcp/mgcp_internal.h
View File

@ -50,7 +50,7 @@ struct mgcp_rtp_state {
};
struct mgcp_endpoint {
int ci;
uint32_t ci;
char *callid;
char *local_options;
int conn_mode;

14
src/mgcp/mgcp_protocol.c
View File

@ -91,7 +91,7 @@ static struct msgb *handle_delete_con(struct mgcp_config *cfg, struct msgb *msg)
static struct msgb *handle_modify_con(struct mgcp_config *cfg, struct msgb *msg);
static struct msgb *handle_rsip(struct mgcp_config *cfg, struct msgb *msg);
static int generate_call_id(struct mgcp_config *cfg)
static uint32_t generate_call_id(struct mgcp_config *cfg)
{
int i;
@ -172,7 +172,7 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
addr = endp->cfg->source_addr;
snprintf(sdp_record, sizeof(sdp_record) - 1,
"I: %d\n\n"
"I: %u\n\n"
"v=0\r\n"
"c=IN IP4 %s\r\n"
"m=audio %d RTP/AVP %d\r\n"
@ -326,11 +326,13 @@ static int verify_call_id(const struct mgcp_endpoint *endp,
}
static int verify_ci(const struct mgcp_endpoint *endp,
const char *ci)
const char *_ci)
{
if (atoi(ci) != endp->ci) {
LOGP(DMGCP, LOGL_ERROR, "ConnectionIdentifiers do not match on 0x%x. %d != %s\n",
ENDPOINT_NUMBER(endp), endp->ci, ci);
uint32_t ci = strtoul(_ci, NULL, 10);
if (ci != endp->ci) {
LOGP(DMGCP, LOGL_ERROR, "ConnectionIdentifiers do not match on 0x%x. %u != %s\n",
ENDPOINT_NUMBER(endp), endp->ci, _ci);
return -1;
}