kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 59788,59803 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r59788 | nadi | 2007-04-03 11:37:00 +0200 (Di, 03 Apr 2007) | 2 lines

Use the new sysfs way of mISDN 1.2 to check if a port is NT or not.

........
r59803 | nadi | 2007-04-03 12:40:58 +0200 (Di, 03 Apr 2007) | 2 lines

ptp is the 5th bit, not the 4th.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@59804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Nadi Sarrar
2007-04-03 11:02:46 +00:00
parent 30ace959bb
commit 911a8f501d
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/misdn/chan_misdn_config.h
View File

@@ -84,7 +84,9 @@ enum misdn_cfg_elements {
/* general config items */
MISDN_GEN_FIRST,
#ifndef MISDN_1_2
MISDN_GEN_MISDN_INIT, /* char[] */
#endif
MISDN_GEN_DEBUG, /* int */
MISDN_GEN_TRACEFILE, /* char[] */
MISDN_GEN_BRIDGING, /* int (bool) */

23
channels/misdn_config.c
View File

@@ -328,8 +328,10 @@ static const struct misdn_cfg_spec gen_spec[] = {
"\t2 - Messages + Message specific Informations (e.g. bearer capability)\n"
"\t3 - very Verbose, the above + lots of Driver specific infos\n"
"\t4 - even more Verbose than 3" },
#ifndef MISDN_1_2
{ "misdn_init", MISDN_GEN_MISDN_INIT, MISDN_CTYPE_STR, "/etc/misdn-init.conf", NONE,
"Set the path to the misdn-init.conf (for nt_ptp mode checking)." },
#endif
{ "tracefile", MISDN_GEN_TRACEFILE, MISDN_CTYPE_STR, "/var/log/asterisk/misdn.log", NONE,
"Set the path to the massively growing trace file, if you want that." },
{ "bridging", MISDN_GEN_BRIDGING, MISDN_CTYPE_BOOL, "yes", NONE,
@@ -978,6 +980,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;
@@ -1008,6 +1011,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<<5 ? 1 : 0;
fclose(fp);
}
#endif
}
static void _fill_defaults (void)