kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 18:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple revisions 350788-350789

Browse Source 
........
  r350788 | kpfleming | 2012-01-14 09:22:33 -0600 (Sat, 14 Jan 2012) | 8 lines
  
  Ensure that two prerequisites are properly installed on Debian-style distributions.
  
  * Don't specify a specific version of libgmime; newer versions are available
    now and acceptable.
  
  * Install libsrtp so that res_srtp can be built.
........
  r350789 | kpfleming | 2012-01-14 09:23:32 -0600 (Sat, 14 Jan 2012) | 3 lines
  
  Correct some 'set-but-not-used' variable warnings.
........

Merged revisions 350788-350789 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 350790 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2012-01-14 15:51:43 +00:00
parent d05a7d45cd
commit 0f83634984
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_pktccops.c
View File

@@ -1029,7 +1029,7 @@ static int load_pktccops_config(void)
struct cops_cmts *cmts;
struct cops_ippool *new_ippool;
const char *host, *cat, *port;
int sfd, update;
int update;
int res = 0;
uint16_t t1_temp, t7_temp, t8_temp;
uint32_t keepalive_temp;
@@ -1063,7 +1063,6 @@ static int load_pktccops_config(void)
/* Defaults */
host = NULL;
port = NULL;
sfd = 0;
t1_temp = t1;
t7_temp = t7;
t8_temp = t8;
@@ -1333,7 +1332,6 @@ static char *pktccops_gateset(struct ast_cli_entry *e, int cmd, struct ast_cli_a
unsigned int an,bn,cn,dn;
uint32_t mta, ssip;
struct cops_cmts *cmts;
struct cops_gate *gate;
switch (cmd) {
case CLI_INIT:
@@ -1380,7 +1378,7 @@ static char *pktccops_gateset(struct ast_cli_entry *e, int cmd, struct ast_cli_a
}
ssip = an << 24 | bn << 16 | cn << 8 | dn;
gate = cops_gate_cmd(GATE_SET, cmts, trid, mta, atoi(a->argv[4]), atof(a->argv[5]), atoi(a->argv[6]), ssip, atoi(a->argv[8]), NULL);
cops_gate_cmd(GATE_SET, cmts, trid, mta, atoi(a->argv[4]), atof(a->argv[5]), atoi(a->argv[6]), ssip, atoi(a->argv[8]), NULL);
return CLI_SUCCESS;
}