Review Board 1.7.16


MFC/R2 support for chan_dahdi

Review Request #40 - Created Nov. 7, 2008 and submitted

Moises Silva
team/moy/mfcr2
Reviewers
asterisk-dev
Asterisk
MFC/R2 support for chan_dahdi.

The code for tone detection (main/dsp.c) and generation (DAHDI MF support in chan_dahdi.c) is not actually being used now. In the early stages of development, spandsp was not LGPL and that's why applications can provide a MF interface to generate and detect the tones required for this signaling to work. Now that spandsp is LGPL, openr2 has embedded the R2 MF detector and generator and is the one currently being used. I had issues (tones either not being generated or not being detected properly) in some x86 64 bit, and the detection was 50% slower than the one in spandsp. Unless there is some important reason you can think of to switch back to DAHDI and main/dsp generator and detector, I suggest to get rid of that code, but I wanted to ask first. 

There is an issue with the way I currently handle how many monitor threads I launch. This code will launch as many monitor threads as group of channels are specified in the chan_dahdi.conf file.

channel=1-15,17-31

That would launch 2 monitor threads and use 2 r2link structures. There is maximum of NUM_SPANS r2link structures statically allocated when the module is loaded.

channel=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15

That would launch 15 threads, 15 r2link structures would be used with only 1 channel each. If some user specify the channels this way, a single DAHDI span would consume all the available structures. Not a common scenario though, since most users would just specify 1-15 in such cases. Should I get rid of that mechanism for launching monitor threads?
Lots of users currently using this in 1.2, 1.4 and 1.6 in Brazil, México and Argentina. An unknown number of users (but at least 1) for each of the following countries: colombia, nepal, thailand, venezuela, perú and probably others. The code in chan_dahdi.c is independent of the variants though, which are handled by the OpenR2 library.

Diff revision 2

This is not the most recent revision of the diff. The latest diff is revision 4. See what's changed.

1 2 3 4
1 2 3 4

  1. /trunk/configure.ac: Loading...
  2. /trunk/makeopts.in: Loading...
  3. /trunk/channels/chan_dahdi.c: Loading...
  4. /trunk/configs/chan_dahdi.conf.sample: Loading...
/trunk/configure.ac
Revision 157241 New Change
[20] 252 lines
[+20]
253
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
253
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
254
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
254
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
255
AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
255
AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
256
AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
256
AST_EXT_LIB_SETUP([SPANDSP], [SPANDSP], [spandsp])
257
AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])
257
AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7])

    
   
258
AST_EXT_LIB_SETUP([OPENR2], [MFR2], [openr2])
258
AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
259
AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
259
AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
260
AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
260
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
261
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
261
AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
262
AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
262
AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
263
AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
[+20] [20] 1123 lines
[+20]
1386
	AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff])
1387
	AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [span_set_message_handler], [spandsp.h], [-ltiff])
1387
fi
1388
fi
1388

    
   
1389

   
1389
AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h])
1390
AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h])
1390

    
   
1391

   

    
   
1392
AST_EXT_LIB_CHECK([OPENR2], [openr2], [openr2_chan_new], [openr2.h])

    
   
1393

   
1391
if test "${USE_PWLIB}" != "no"; then
1394
if test "${USE_PWLIB}" != "no"; then
1392
	if test -n "${PWLIB_DIR}"; then
1395
	if test -n "${PWLIB_DIR}"; then
1393
		PWLIBDIR="${PWLIB_DIR}"
1396
		PWLIBDIR="${PWLIB_DIR}"
1394
	fi
1397
	fi
1395
	AST_CHECK_PWLIB()
1398
	AST_CHECK_PWLIB()
[+20] [20] 304 lines
/trunk/makeopts.in
Revision 157241 New Change
 
/trunk/channels/chan_dahdi.c
Revision 157241 New Change
 
/trunk/configs/chan_dahdi.conf.sample
Revision 157241 New Change
 
  1. /trunk/configure.ac: Loading...
  2. /trunk/makeopts.in: Loading...
  3. /trunk/channels/chan_dahdi.c: Loading...
  4. /trunk/configs/chan_dahdi.conf.sample: Loading...

https://reviewboard.asterisk.org/ runs on a server provided by Digium, Inc. and uses bandwidth donated to the open source Asterisk community by API Digital Communications in Huntsville, AL USA.
Please report problems with this site to asteriskteam@digium.com.