kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-05-04 04:16:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-04-03 10:38:41 +00:00
parent 5901452ecb
commit 48e2d876ff
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
channels/misdn_config.c
View File

@@ -128,7 +128,9 @@ static const struct misdn_cfg_spec port_spec[] = {
static const struct misdn_cfg_spec gen_spec[] = {
{ "debug", MISDN_GEN_DEBUG, MISDN_CTYPE_INT, "0", NONE },
#ifndef MISDN_1_2
{ "misdn_init", MISDN_GEN_MISDN_INIT, MISDN_CTYPE_STR, "/etc/misdn-init.conf", NONE },
#endif
{ "tracefile", MISDN_GEN_TRACEFILE, MISDN_CTYPE_STR, "/var/log/asterisk/misdn.log", NONE },
{ "bridging", MISDN_GEN_BRIDGING, MISDN_CTYPE_BOOL, "yes", NONE },
{ "stop_tone_after_first_digit", MISDN_GEN_STOP_TONE, MISDN_CTYPE_BOOL, "yes", NONE },
@@ -670,6 +672,7 @@ static void _build_port_config (struct ast_variable *v, char *cat)
void misdn_cfg_update_ptp (void)
{
#ifndef MISDN_1_2
char misdn_init[BUFFERSIZE];
char line[BUFFERSIZE];
FILE *fp;
@@ -700,6 +703,26 @@ void misdn_cfg_update_ptp (void)
ast_log(LOG_WARNING,"Couldn't open %s: %s\n", misdn_init, strerror(errno));
}
}
#else
int i;
int proto;
char filename[128];
FILE *fp;
for (i = 1; i <= max_ports; ++i) {
snprintf(filename, sizeof(filename), "/sys/class/mISDN-stacks/st-%08x/protocol", i << 8);
fp = fopen(filename, "r");
if (!fp) {
ast_log(LOG_WARNING, "Could not open %s: %s\n", filename, strerror(errno));
continue;
}
if (fscanf(fp, "0x%08x", &proto) != 1)
ast_log(LOG_WARNING, "Could not parse contents of %s!\n", filename);
else
ptp[i] = proto & 1<<4 ? 1 : 0;
fclose(fp);
}
#endif
}
static void _fill_defaults (void)