kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ftmod_libpri: Fix reversed PTP/PTMP mode parameter

This commit is contained in:
Stefan Knoblich 2010-11-06 18:28:37 +01:00
parent 6ca919be61
commit b9391cffc2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
View File

@ -1099,14 +1099,14 @@ static void *ftdm_libpri_run(ftdm_thread_t *me, void *obj)
break; break;
case FTDM_TRUNK_BRI: case FTDM_TRUNK_BRI:
res = lpwrap_init_bri(&isdn_data->spri, span, isdn_data->dchan, res = lpwrap_init_bri(&isdn_data->spri, span, isdn_data->dchan,
isdn_data->pswitch, isdn_data->node, 0, isdn_data->debug); isdn_data->pswitch, isdn_data->node, 1, isdn_data->debug);
#ifndef HAVE_LIBPRI_BRI #ifndef HAVE_LIBPRI_BRI
goto out; goto out;
#endif #endif
break; break;
case FTDM_TRUNK_BRI_PTMP: case FTDM_TRUNK_BRI_PTMP:
res = lpwrap_init_bri(&isdn_data->spri, span, isdn_data->dchan, res = lpwrap_init_bri(&isdn_data->spri, span, isdn_data->dchan,
isdn_data->pswitch, isdn_data->node, 1, isdn_data->debug); isdn_data->pswitch, isdn_data->node, 0, isdn_data->debug);
#ifndef HAVE_LIBPRI_BRI #ifndef HAVE_LIBPRI_BRI
goto out; goto out;
#endif #endif

5
libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.c
View File

@ -195,9 +195,10 @@ int lpwrap_init_pri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *
return ret; return ret;
} }
int lpwrap_init_bri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int ptmp, int debug) int lpwrap_init_bri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int ptp, int debug)
{ {
int ret = -1; int ret = -1;
#ifdef HAVE_LIBPRI_BRI #ifdef HAVE_LIBPRI_BRI
memset(spri, 0, sizeof(struct lpwrap_pri)); memset(spri, 0, sizeof(struct lpwrap_pri));
spri->dchan = dchan; spri->dchan = dchan;
@ -208,7 +209,7 @@ int lpwrap_init_bri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *
return ret; return ret;
} }
if ((spri->pri = pri_new_bri_cb(spri->dchan->sockfd, ptmp, node, swtype, __pri_lpwrap_read, __pri_lpwrap_write, spri))) { if ((spri->pri = pri_new_bri_cb(spri->dchan->sockfd, ptp, node, swtype, __pri_lpwrap_read, __pri_lpwrap_write, spri))) {
unsigned char buf[4] = { 0 }; unsigned char buf[4] = { 0 };
size_t buflen = sizeof(buf), len = 0; size_t buflen = sizeof(buf), len = 0;

2
libs/freetdm/src/ftmod/ftmod_libpri/lpwrap_pri.h
View File

@ -121,7 +121,7 @@ struct lpwrap_pri_event_list {
const char *lpwrap_pri_event_str(lpwrap_pri_event_t event_id); const char *lpwrap_pri_event_str(lpwrap_pri_event_t event_id);
int lpwrap_one_loop(struct lpwrap_pri *spri); int lpwrap_one_loop(struct lpwrap_pri *spri);
int lpwrap_init_pri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int debug); int lpwrap_init_pri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int debug);
int lpwrap_init_bri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int ptmp, int debug); int lpwrap_init_bri(struct lpwrap_pri *spri, ftdm_span_t *span, ftdm_channel_t *dchan, int swtype, int node, int ptp, int debug);
int lpwrap_run_pri(struct lpwrap_pri *spri); int lpwrap_run_pri(struct lpwrap_pri *spri);
#define lpwrap_run_bri(x) lpwrap_run_pri(x) #define lpwrap_run_bri(x) lpwrap_run_pri(x)