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

adj 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@365 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-01-13 14:23:34 +00:00
parent 4afca4dc0b
commit a8aa67ea6a
7 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mod/codecs/mod_g711/mod_g711.vcproj
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mod_g711codec" Name="mod_g711"
ProjectGUID="{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" ProjectGUID="{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"
RootNamespace="mod_g711codec" RootNamespace="mod_g711"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@ -62,13 +62,13 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711codec.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_g711codec.pdb" ProgramDatabaseFile="$(OutDir)/mod_g711.pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/mod_g711codec.lib" ImportLibrary="$(OutDir)/mod_g711.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -140,14 +140,14 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711codec.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g711.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_g711codec.lib" ImportLibrary="$(OutDir)/mod_g711.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -189,7 +189,7 @@
> >
</File> </File>
<File <File
RelativePath=".\mod_g711codec.c" RelativePath=".\mod_g711.c"
> >
</File> </File>
</Filter> </Filter>

16
src/mod/codecs/mod_g729/mod_g729.vcproj
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mod_codec_g729" Name="mod_g729"
ProjectGUID="{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" ProjectGUID="{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}"
RootNamespace="mod_codec_g729" RootNamespace="mod_g729"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@ -64,13 +64,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libg729.lib FreeSwitchCore.lib" AdditionalDependencies="libg729.lib FreeSwitchCore.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g729.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\codec\libg729\Debug&quot;;..\..\..\..\w32\vsnet\Debug" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\apr\Debug&quot;;&quot;$(InputDir)..\..\..\..\libs\codec\libg729\Debug&quot;;..\..\..\..\w32\vsnet\Debug"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_codec_g729.pdb" ProgramDatabaseFile="$(OutDir)/mod_g729.pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/mod_codec_g729.lib" ImportLibrary="$(OutDir)/mod_g729.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -144,14 +144,14 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libg729.lib FreeSwitchCore.lib" AdditionalDependencies="libg729.lib FreeSwitchCore.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_g729.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_g729.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\codec\libg729\Release&quot;;..\..\..\..\w32\vsnet\Release" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\apr\Release&quot;;&quot;$(InputDir)..\..\..\..\libs\codec\libg729\Release&quot;;..\..\..\..\w32\vsnet\Release"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_codec_g729.lib" ImportLibrary="$(OutDir)/mod_g729.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -189,7 +189,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath="mod_codec_g729.c" RelativePath="mod_g729.c"
> >
</File> </File>
</Filter> </Filter>

16
src/mod/codecs/mod_gsm/mod_gsm.vcproj
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mod_codec_gsm" Name="mod_gsm"
ProjectGUID="{4926323F-4EA8-4B7D-A3D3-65488725988F}" ProjectGUID="{4926323F-4EA8-4B7D-A3D3-65488725988F}"
RootNamespace="mod_codec_gsm" RootNamespace="mod_gsm"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@ -64,13 +64,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libgsm.lib FreeSwitchCore.lib" AdditionalDependencies="libgsm.lib FreeSwitchCore.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_gsm.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;..\..\..\..\w32\vsnet\Debug" AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;..\..\..\..\w32\vsnet\Debug"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_codec_gsm.pdb" ProgramDatabaseFile="$(OutDir)/mod_gsm.pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/mod_codec_gsm.lib" ImportLibrary="$(OutDir)/mod_gsm.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -144,7 +144,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libgsm.lib FreeSwitchCore.lib" AdditionalDependencies="libgsm.lib FreeSwitchCore.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_codec_gsm.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;..\..\..\..\w32\vsnet\Release" AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;..\..\..\..\w32\vsnet\Release"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -152,7 +152,7 @@
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
LinkTimeCodeGeneration="1" LinkTimeCodeGeneration="1"
ImportLibrary="$(OutDir)/mod_codec_gsm.lib" ImportLibrary="$(OutDir)/mod_gsm.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -190,7 +190,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath="mod_codec_gsm.c" RelativePath="mod_gsm.c"
> >
</File> </File>
</Filter> </Filter>

20
src/mod/codecs/mod_l16/modl16.vcproj
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mod_rawaudio" Name="mod_l16"
ProjectGUID="{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" ProjectGUID="{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"
RootNamespace="mod_rawaudio" RootNamespace="mod_l16"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@ -25,7 +25,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_rawaudio Debug" CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_l16 Debug"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -64,13 +64,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libresampled.lib" AdditionalDependencies="libresampled.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_l16.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_rawaudio.pdb" ProgramDatabaseFile="$(OutDir)/mod_l16.pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/mod_rawaudio.lib" ImportLibrary="$(OutDir)/mod_l16.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -108,7 +108,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_rawaudio Release" CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs mod_l16 Release"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -144,14 +144,14 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libresample.lib" AdditionalDependencies="libresample.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_rawaudio.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_l16.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\libresample\win&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_rawaudio.lib" ImportLibrary="$(OutDir)/mod_l16.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -189,7 +189,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\mod_rawaudio.c" RelativePath=".\mod_l16.c"
> >
</File> </File>
</Filter> </Filter>

20
src/mod/codecs/mod_speex/mod_speex.vcproj
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mod_speexcodec" Name="mod_speex"
ProjectGUID="{5580D60E-0F77-4716-9CD4-B8E5986FA375}" ProjectGUID="{5580D60E-0F77-4716-9CD4-B8E5986FA375}"
RootNamespace="mod_speexcodec" RootNamespace="mod_speex"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@ -25,7 +25,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Debug" CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Speex Debug"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -64,13 +64,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libspeex.lib" AdditionalDependencies="libspeex.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speexcodec.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speex.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Debug&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Debug&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_speexcodec.pdb" ProgramDatabaseFile="$(OutDir)/mod_speex.pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/mod_speexcodec.lib" ImportLibrary="$(OutDir)/mod_speex.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -108,7 +108,7 @@
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_SpeexCodec Release" CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Speex Release"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -144,14 +144,14 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libspeex.lib" AdditionalDependencies="libspeex.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speexcodec.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_speex.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\speex\win32\libspeex\Release&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_speexcodec.lib" ImportLibrary="$(OutDir)/mod_speex.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -189,7 +189,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\mod_speexcodec.c" RelativePath=".\mod_speex.c"
> >
</File> </File>
</Filter> </Filter>

88
src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
View File

@ -26,7 +26,7 @@
* Anthony Minessale II <anthmct@yahoo.com> * Anthony Minessale II <anthmct@yahoo.com>
* *
* *
* mod_wanchan.c -- WANPIPE PRI Channel Module * mod_wanpipe.c -- WANPIPE PRI Channel Module
* *
*/ */
#include <switch.h> #include <switch.h>
@ -41,7 +41,7 @@
#include <libsangoma.h> #include <libsangoma.h>
#include <sangoma_pri.h> #include <sangoma_pri.h>
static const char modname[] = "mod_wanchan"; static const char modname[] = "mod_wanpipe";
#define STRLEN 15 #define STRLEN 15
static switch_memory_pool *module_pool; static switch_memory_pool *module_pool;
@ -149,13 +149,13 @@ static int str2switch(char *swtype)
static void set_global_dialplan(char *dialplan); static void set_global_dialplan(char *dialplan);
static int str2node(char *node); static int str2node(char *node);
static int str2switch(char *swtype); static int str2switch(char *swtype);
static switch_status wanchan_on_init(switch_core_session *session); static switch_status wanpipe_on_init(switch_core_session *session);
static switch_status wanchan_on_hangup(switch_core_session *session); static switch_status wanpipe_on_hangup(switch_core_session *session);
static switch_status wanchan_on_loopback(switch_core_session *session); static switch_status wanpipe_on_loopback(switch_core_session *session);
static switch_status wanchan_on_transmit(switch_core_session *session); static switch_status wanpipe_on_transmit(switch_core_session *session);
static switch_status wanchan_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session); static switch_status wanpipe_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
static switch_status wanchan_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id); static switch_status wanpipe_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id);
static switch_status wanchan_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id); static switch_status wanpipe_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id);
static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event); static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event); static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event); static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
@ -172,7 +172,7 @@ static int config_wanpipe(int reload);
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it. so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
*/ */
static switch_status wanchan_on_init(switch_core_session *session) static switch_status wanpipe_on_init(switch_core_session *session)
{ {
struct private_object *tech_pvt; struct private_object *tech_pvt;
switch_channel *channel = NULL; switch_channel *channel = NULL;
@ -185,7 +185,7 @@ static switch_status wanchan_on_init(switch_core_session *session)
tech_pvt->frame.data = tech_pvt->databuf; tech_pvt->frame.data = tech_pvt->databuf;
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANCHAN INIT\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE INIT\n");
/* Move Channel's State Machine to RING */ /* Move Channel's State Machine to RING */
@ -193,7 +193,7 @@ static switch_status wanchan_on_init(switch_core_session *session)
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status wanchan_on_ring(switch_core_session *session) static switch_status wanpipe_on_ring(switch_core_session *session)
{ {
switch_channel *channel = NULL; switch_channel *channel = NULL;
struct private_object *tech_pvt = NULL; struct private_object *tech_pvt = NULL;
@ -204,12 +204,12 @@ static switch_status wanchan_on_ring(switch_core_session *session)
tech_pvt = switch_core_session_get_private(session); tech_pvt = switch_core_session_get_private(session);
assert(tech_pvt != NULL); assert(tech_pvt != NULL);
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANCHAN RING\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE RING\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status wanchan_on_hangup(switch_core_session *session) static switch_status wanpipe_on_hangup(switch_core_session *session)
{ {
struct private_object *tech_pvt; struct private_object *tech_pvt;
switch_channel *channel = NULL; switch_channel *channel = NULL;
@ -225,30 +225,30 @@ static switch_status wanchan_on_hangup(switch_core_session *session)
pri_hangup(tech_pvt->spri->pri, tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call, tech_pvt->cause); pri_hangup(tech_pvt->spri->pri, tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call, tech_pvt->cause);
pri_destroycall(tech_pvt->spri->pri, tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call); pri_destroycall(tech_pvt->spri->pri, tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call);
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANCHAN HANGUP\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE HANGUP\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status wanchan_on_loopback(switch_core_session *session) static switch_status wanpipe_on_loopback(switch_core_session *session)
{ {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANCHAN LOOPBACK\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE LOOPBACK\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status wanchan_on_transmit(switch_core_session *session) static switch_status wanpipe_on_transmit(switch_core_session *session)
{ {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANCHAN TRANSMIT\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE TRANSMIT\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status wanchan_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session) static switch_status wanpipe_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
{ {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NOT IMPLEMENTED\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NOT IMPLEMENTED\n");
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
static switch_status wanchan_answer_channel(switch_core_session *session) static switch_status wanpipe_answer_channel(switch_core_session *session)
{ {
struct private_object *tech_pvt; struct private_object *tech_pvt;
switch_channel *channel = NULL; switch_channel *channel = NULL;
@ -266,7 +266,7 @@ static switch_status wanchan_answer_channel(switch_core_session *session)
static switch_status wanchan_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id) static switch_status wanpipe_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id)
{ {
struct private_object *tech_pvt; struct private_object *tech_pvt;
switch_channel *channel = NULL; switch_channel *channel = NULL;
@ -312,7 +312,7 @@ static switch_status wanchan_read_frame(switch_core_session *session, switch_fra
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
static switch_status wanchan_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id) static switch_status wanpipe_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id)
{ {
struct private_object *tech_pvt; struct private_object *tech_pvt;
switch_channel *channel = NULL; switch_channel *channel = NULL;
@ -352,33 +352,33 @@ static switch_status wanchan_write_frame(switch_core_session *session, switch_fr
return status; return status;
} }
static const switch_io_routines wanchan_io_routines*/ { static const switch_io_routines wanpipe_io_routines*/ {
/*.outgoing_channel*/ wanchan_outgoing_channel, /*.outgoing_channel*/ wanpipe_outgoing_channel,
/*.answer_channel*/ wanchan_answer_channel, /*.answer_channel*/ wanpipe_answer_channel,
/*.read_frame*/ wanchan_read_frame, /*.read_frame*/ wanpipe_read_frame,
/*.write_frame*/ wanchan_write_frame /*.write_frame*/ wanpipe_write_frame
}; };
static const switch_event_handler_table wanchan_event_handlers = { static const switch_event_handler_table wanpipe_event_handlers = {
/*.on_init*/ wanchan_on_init, /*.on_init*/ wanpipe_on_init,
/*.on_ring*/ wanchan_on_ring, /*.on_ring*/ wanpipe_on_ring,
/*.on_execute*/ NULL, /*.on_execute*/ NULL,
/*.on_hangup*/ wanchan_on_hangup, /*.on_hangup*/ wanpipe_on_hangup,
/*.on_loopback*/ wanchan_on_loopback, /*.on_loopback*/ wanpipe_on_loopback,
/*.on_transmit*/ wanchan_on_transmit /*.on_transmit*/ wanpipe_on_transmit
}; };
static const switch_endpoint_interface wanchan_endpoint_interface = { static const switch_endpoint_interface wanpipe_endpoint_interface = {
/*.interface_name*/ "wanchan", /*.interface_name*/ "wanpipe",
/*.io_routines*/ &wanchan_io_routines, /*.io_routines*/ &wanpipe_io_routines,
/*.event_handlers*/ &wanchan_event_handlers, /*.event_handlers*/ &wanpipe_event_handlers,
/*.private*/ NULL, /*.private*/ NULL,
/*.next*/ NULL /*.next*/ NULL
}; };
static const switch_loadable_module_interface wanchan_module_interface = { static const switch_loadable_module_interface wanpipe_module_interface = {
/*.module_name*/ modname, /*.module_name*/ modname,
/*.endpoint_interface*/ &wanchan_endpoint_interface, /*.endpoint_interface*/ &wanpipe_endpoint_interface,
/*.timer_interface*/ NULL, /*.timer_interface*/ NULL,
/*.dialplan_interface*/ NULL, /*.dialplan_interface*/ NULL,
/*.codec_interface*/ NULL, /*.codec_interface*/ NULL,
@ -394,7 +394,7 @@ Public switch_status switch_module_load(const switch_loadable_module_interface *
} }
/* connect my internal structure to the blank pointer passed to me */ /* connect my internal structure to the blank pointer passed to me */
*interface = &wanchan_module_interface; *interface = &wanpipe_module_interface;
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
@ -460,7 +460,7 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
switch_console_printf(SWITCH_CHANNEL_CONSOLE,"-- Ring on channel %d (from %s to %s)\n", event->ring.channel, event->ring.callingnum, event->ring.callednum); switch_console_printf(SWITCH_CHANNEL_CONSOLE,"-- Ring on channel %d (from %s to %s)\n", event->ring.channel, event->ring.callingnum, event->ring.callednum);
sprintf(name, "w%dg%d", globals.span, event->ring.channel); sprintf(name, "w%dg%d", globals.span, event->ring.channel);
if ((session = switch_core_session_request(&wanchan_endpoint_interface, NULL))) { if ((session = switch_core_session_request(&wanpipe_endpoint_interface, NULL))) {
struct private_object *tech_pvt; struct private_object *tech_pvt;
int fd; int fd;
char ani2str[4] = ""; char ani2str[4] = "";
@ -483,7 +483,7 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
if ((tech_pvt->caller_profile = switch_caller_profile_new(session, if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
globals.dialplan, globals.dialplan,
"wanchan fixme", "wanpipe fixme",
event->ring.callingnum, event->ring.callingnum,
event->ring.callingani, event->ring.callingani,
switch_strlen_zero(ani2str) ? NULL : ani2str, switch_strlen_zero(ani2str) ? NULL : ani2str,
@ -571,7 +571,7 @@ static int config_wanpipe(int reload)
char *var, *val; char *var, *val;
int count = 0; int count = 0;
struct sangoma_pri *spri; struct sangoma_pri *spri;
char *cf = "wanchan.conf"; char *cf = "wanpipe.conf";
globals.bytes_per_frame = DEFAULT_BYTES_PER_FRAME; globals.bytes_per_frame = DEFAULT_BYTES_PER_FRAME;

16
src/mod/endpoints/mod_woomera/mod_woomera.vcproj
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="mod_woomerachan" Name="mod_woomera"
ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}" ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}"
RootNamespace="mod_woomerachan" RootNamespace="mod_woomera"
Keyword="Win32Proj" Keyword="Win32Proj"
> >
<Platforms> <Platforms>
@ -62,13 +62,13 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomerachan.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomera.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug" AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_woomerachan.pdb" ProgramDatabaseFile="$(OutDir)/mod_woomera.pdb"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/mod_woomerachan.lib" ImportLibrary="$(OutDir)/mod_woomera.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -140,14 +140,14 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomerachan.dll" OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_woomera.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;" AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/mod_woomerachan.lib" ImportLibrary="$(OutDir)/mod_woomera.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@ -185,7 +185,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\mod_woomerachan.c" RelativePath=".\mod_woomera.c"
> >
</File> </File>
</Filter> </Filter>