~phatforge/freeswitch/+git/master:sangoma_1.6_raw

Last commit made on 2016-04-22
Get this branch:
git clone -b sangoma_1.6_raw https://git.launchpad.net/~phatforge/freeswitch/+git/master

Branch merges

Branch information

Name:
sangoma_1.6_raw
Repository:
lp:~phatforge/freeswitch/+git/master

Recent commits

684524f... by Pushkar Singh <email address hidden>

Committing patch for Freeswitch v1.6 to make it compile with (Sangoma + Public) merged freeTDM

3743199... by Pushkar Singh <email address hidden>

Fixing Compilation as well as core dump issues while unloading modules
and adding left over new files

64a0e28... by Pushkar Singh <email address hidden>

Merge branch 'sangoma_freetdm' into public_v1.6-merge and Fixing
Conflicts

Conflicts:
 Makefile.am
 conf/freetdm.conf.xml
 mod_freetdm/mod_freetdm.c
 src/ftdm_io.c
 src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
 src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
 src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
 src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
 src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
 src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
 src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
 src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
 src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_in.c
 src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
 src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
 src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
 src/include/freetdm.h
 src/include/private/ftdm_core.h

5fc08e1... by kapil gupta <email address hidden>

Merge branch 'dev/nsg-5.2/master' of ssh://git.eng.sangoma.com/core/freeswitch into dev/nsg-5.2/master

974a1ac... by Pushkar Singh <email address hidden>

Removing unwanted logs from ss7 module

dde1c80... by kapil gupta <email address hidden>

Fixing issue where we were simply relaying sip cause to ss7 cause which
results in wrong ss7 cause was going.
Added logic to convert sip cause to ss7 before forwarding to ss7 leg

aca16f8... by Davide Colombo <email address hidden>

OPENZAP-241: set always STATE_HANGUP_COMPLETE

98b5185... by Kapil Gupta <email address hidden>

Merge pull request #78 in CORE/freeswitch from dev/nsg-5.2/12800 to dev/nsg-5.2/master

* commit 'c1ccc2b884db15130154d44e2eb580e4b7e535a4':
  Fix Issue #12800: NSG Goes on infinite loop of changing Channel state if wanpipe alarms are continiously changing

f4519a9... by Kapil Gupta <email address hidden>

Merge pull request #80 in CORE/freeswitch from dev/nsg-5.2/12808 to dev/nsg-5.2/master

* commit 'ea7fc58736d25b65afc0a35bb99fff5b60f2a2b0':
  Fix Issue #12808: Add io_timer_offset to freetdm.conf.xml instead of freetdm.conf with minor code adjustments

2e17342... by Pushkar Singh <email address hidden>

Fix Issue #12797: T309 timer increase in the NSG

Introducing configurable parameter "timer-tCon" i.e tconnection timer in
order to configure T309 timer as at ISDN t309 is handeled by TCON timer