adj

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@365 d0543943-73ff-0310-b7d9-9358b9ac24b2

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

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

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

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

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

diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
index 3d2ee407588c957b84965e7f807d2562436fddc7..c624475f477dc0325092a735d6feba56ad9127e2 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
@@ -26,7 +26,7 @@
  * Anthony Minessale II <anthmct@yahoo.com>
  *
  *
- * mod_wanchan.c -- WANPIPE PRI Channel Module
+ * mod_wanpipe.c -- WANPIPE PRI Channel Module
  *
  */
 #include <switch.h>
@@ -41,7 +41,7 @@
 #include <libsangoma.h>
 #include <sangoma_pri.h>
 
-static const char modname[] = "mod_wanchan";
+static const char modname[] = "mod_wanpipe";
 #define STRLEN 15
 
 static switch_memory_pool *module_pool;
@@ -149,13 +149,13 @@ static int str2switch(char *swtype)
 static void set_global_dialplan(char *dialplan);
 static int str2node(char *node);
 static int str2switch(char *swtype);
-static switch_status wanchan_on_init(switch_core_session *session);
-static switch_status wanchan_on_hangup(switch_core_session *session);
-static switch_status wanchan_on_loopback(switch_core_session *session);
-static switch_status wanchan_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 wanchan_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_on_init(switch_core_session *session);
+static switch_status wanpipe_on_hangup(switch_core_session *session);
+static switch_status wanpipe_on_loopback(switch_core_session *session);
+static switch_status wanpipe_on_transmit(switch_core_session *session);
+static switch_status wanpipe_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
+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 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_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);
@@ -172,7 +172,7 @@ static int config_wanpipe(int reload);
    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.
 */
-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;
        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;
        
-       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 */
@@ -193,7 +193,7 @@ static switch_status wanchan_on_init(switch_core_session *session)
        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;
        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);
        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;
 }
 
-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;
        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_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;
 }
 
-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;
 }
 
-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;
 }
 
-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");
 
        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;
        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;
        switch_channel *channel = NULL;
@@ -312,7 +312,7 @@ static switch_status wanchan_read_frame(switch_core_session *session, switch_fra
        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;
        switch_channel *channel = NULL;
@@ -352,33 +352,33 @@ static switch_status wanchan_write_frame(switch_core_session *session, switch_fr
        return status;
 }
 
-static const switch_io_routines wanchan_io_routines*/  {
-       /*.outgoing_channel*/   wanchan_outgoing_channel,
-       /*.answer_channel*/             wanchan_answer_channel,
-       /*.read_frame*/                 wanchan_read_frame,
-       /*.write_frame*/                wanchan_write_frame
+static const switch_io_routines wanpipe_io_routines*/  {
+       /*.outgoing_channel*/   wanpipe_outgoing_channel,
+       /*.answer_channel*/             wanpipe_answer_channel,
+       /*.read_frame*/                 wanpipe_read_frame,
+       /*.write_frame*/                wanpipe_write_frame
 };
 
-static const switch_event_handler_table  wanchan_event_handlers = {
-       /*.on_init*/            wanchan_on_init,
-       /*.on_ring*/            wanchan_on_ring,
+static const switch_event_handler_table  wanpipe_event_handlers = {
+       /*.on_init*/            wanpipe_on_init,
+       /*.on_ring*/            wanpipe_on_ring,
        /*.on_execute*/         NULL,
-       /*.on_hangup*/          wanchan_on_hangup,
-       /*.on_loopback*/        wanchan_on_loopback,
-       /*.on_transmit*/        wanchan_on_transmit
+       /*.on_hangup*/          wanpipe_on_hangup,
+       /*.on_loopback*/        wanpipe_on_loopback,
+       /*.on_transmit*/        wanpipe_on_transmit
 };
 
-static const switch_endpoint_interface wanchan_endpoint_interface = {
-       /*.interface_name*/     "wanchan",
-       /*.io_routines*/        &wanchan_io_routines,
-       /*.event_handlers*/     &wanchan_event_handlers,
+static const switch_endpoint_interface wanpipe_endpoint_interface = {
+       /*.interface_name*/     "wanpipe",
+       /*.io_routines*/        &wanpipe_io_routines,
+       /*.event_handlers*/     &wanpipe_event_handlers,
        /*.private*/            NULL,
        /*.next*/                       NULL
 };
 
-static const switch_loadable_module_interface wanchan_module_interface = {
+static const switch_loadable_module_interface wanpipe_module_interface = {
        /*.module_name*/                        modname,
-       /*.endpoint_interface*/         &wanchan_endpoint_interface,
+       /*.endpoint_interface*/         &wanpipe_endpoint_interface,
        /*.timer_interface*/            NULL,
        /*.dialplan_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 */
-       *interface = &wanchan_module_interface;
+       *interface = &wanpipe_module_interface;
 
        /* indicate that the module should continue to be loaded */
        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);
 
        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;
                int fd;
                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,
                                                                                                                           globals.dialplan,
-                                                                                                                          "wanchan fixme",
+                                                                                                                          "wanpipe fixme",
                                                                                                                           event->ring.callingnum,
                                                                                                                           event->ring.callingani,
                                                                                                                           switch_strlen_zero(ani2str) ? NULL : ani2str,
@@ -571,7 +571,7 @@ static int config_wanpipe(int reload)
        char *var, *val;
        int count = 0;
        struct sangoma_pri *spri;
-       char *cf = "wanchan.conf";
+       char *cf = "wanpipe.conf";
 
        globals.bytes_per_frame = DEFAULT_BYTES_PER_FRAME;
 

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