diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln index 989673b22f..e8a1bc3812 100644 --- a/Freeswitch.2008.sln +++ b/Freeswitch.2008.sln @@ -125,9 +125,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory", "directory", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sip_profiles", "sip_profiles", "{8E2E8798-8B6F-4A55-8E4F-4E6FDE40ED26}" ProjectSection(SolutionItems) = preProject - conf\sip_profiles\default.xml = conf\sip_profiles\default.xml conf\sip_profiles\nat.xml = conf\sip_profiles\nat.xml - conf\sip_profiles\outbound.xml = conf\sip_profiles\outbound.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{09455AA9-C243-4F16-A1A1-A016881A2765}" @@ -409,7 +407,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoint ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.2008.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" @@ -541,8 +538,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\codec\ilbc\libilbc.2008.vcproj", "{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiax2", "libs\iax\libiax2.2008.vcproj", "{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.2008.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" ProjectSection(ProjectDependencies) = postProject {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -1036,12 +1031,6 @@ Global {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.ActiveCfg = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.Build.0 = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|x64.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|x64.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|x64.ActiveCfg = Release|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1502,7 +1491,6 @@ Global {ACFD96F2-58AA-491D-B4C0-33BD0BD57FDE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} diff --git a/Freeswitch.sln b/Freeswitch.sln index df11372b37..a9fdfde742 100644 --- a/Freeswitch.sln +++ b/Freeswitch.sln @@ -15,7 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Li {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject @@ -35,7 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoint ProjectSection(ProjectDependencies) = postProject {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" @@ -193,8 +191,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbc", "libs\codec\ilbc\libilbc.vcproj", "{989BB874-7AF1-44CB-8E5C-CC8113D267E8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiax2", "libs\iax\libiax2.vcproj", "{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" ProjectSection(ProjectDependencies) = postProject {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -216,15 +212,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "libs\win32\l EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapriconv", "libs\win32\apr-iconv\libapriconv.vcproj", "{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}" - ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" ProjectSection(ProjectDependencies) = postProject {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" @@ -1046,12 +1036,6 @@ Global {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.ActiveCfg = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|Win32.Build.0 = Release|Win32 {989BB874-7AF1-44CB-8E5C-CC8113D267E8}.Release|x64.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|x64.ActiveCfg = Debug|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32 - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|x64.ActiveCfg = Release|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32 {1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1094,12 +1078,6 @@ Global {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.ActiveCfg = Release|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.Build.0 = Release|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.ActiveCfg = Release|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|Win32.ActiveCfg = Debug|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|Win32.Build.0 = Debug|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Debug|x64.ActiveCfg = Debug|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|Win32.ActiveCfg = Release|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|Win32.Build.0 = Release|Win32 - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}.Release|x64.ActiveCfg = Release|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.ActiveCfg = Debug|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32 {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1503,7 +1481,6 @@ Global {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {89385C74-5860-4174-9CAF-A39E7C48909C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} @@ -1511,7 +1488,6 @@ Global {1CED5987-A529-46DC-B30F-870D85FF9C94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} diff --git a/libs/win32/apr-util/libaprutil.vcproj b/libs/win32/apr-util/libaprutil.vcproj index 7f0178bbed..3b64fec396 100644 --- a/libs/win32/apr-util/libaprutil.vcproj +++ b/libs/win32/apr-util/libaprutil.vcproj @@ -230,6 +230,7 @@ > + + + + + + + + + + + + + + + + + + dtmf_parser; + } else { + + } + switch_event_create(¶ms, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); @@ -4514,6 +4521,9 @@ SWITCH_STANDARD_APP(conference_function) switch_buffer_destroy(&member.resample_buffer); switch_buffer_destroy(&member.audio_buffer); switch_buffer_destroy(&member.mux_buffer); + if (member.dtmf_parser != conference->dtmf_parser) { + switch_ivr_digit_stream_parser_destroy(member.dtmf_parser); + } if (conference) { switch_mutex_lock(conference->mutex); diff --git a/src/mod/endpoints/mod_iax/iax.c b/src/mod/endpoints/mod_iax/iax.c index 6e93473f33..d4efcc367b 100644 --- a/src/mod/endpoints/mod_iax/iax.c +++ b/src/mod/endpoints/mod_iax/iax.c @@ -684,13 +684,13 @@ static unsigned char get_n_bits_at(unsigned char *data, int n, int bit) return 0; if (rem < n) { - ret = (data[byte] << (n - rem)); + ret = (unsigned char)(data[byte] << (n - rem)); ret |= (data[byte + 1] >> (8 - n + rem)); } else { - ret = (data[byte] >> (rem - n)); + ret = (unsigned char)(data[byte] >> (rem - n)); } - return (ret & (0xff >> (8 - n))); + return (unsigned char)(ret & (0xff >> (8 - n))); } static int speex_get_wb_sz_at(unsigned char *data, int len, int bit) @@ -957,7 +957,7 @@ int iax_init(char *ip, int preferredportno) { int portno = preferredportno; struct sockaddr_in sin; - unsigned int sinlen; + int sinlen; int flags; init_time(); @@ -1060,7 +1060,7 @@ static unsigned char compress_subclass(int subclass) int power=-1; /* If it's 128 or smaller, just return it */ if (subclass < IAX_FLAG_SC_LOG) - return subclass; + return (unsigned char)subclass; /* Otherwise find its power */ for (x = 0; x < IAX_MAX_SHIFT; x++) { if (subclass & (1 << x)) { @@ -1071,7 +1071,7 @@ static unsigned char compress_subclass(int subclass) power = x; } } - return power | IAX_FLAG_SC_LOG; + return (unsigned char)(power | IAX_FLAG_SC_LOG); } static int iax_send(struct iax_session *pvt, struct ast_frame *f, time_in_ms_t ts, int seqno, int now, int transfer, int final) @@ -1131,7 +1131,7 @@ static int iax_send(struct iax_session *pvt, struct ast_frame *f, time_in_ms_t t return -1; } - fr->callno = pvt->callno; + fr->callno = (unsigned short)pvt->callno; fr->transfer = transfer; fr->final = final; fr->session = pvt; @@ -1145,19 +1145,19 @@ static int iax_send(struct iax_session *pvt, struct ast_frame *f, time_in_ms_t t fh = (struct ast_iax2_full_hdr *)(((char *)fr->af.data) - sizeof(struct ast_iax2_full_hdr)); fh->scallno = htons(fr->callno | IAX_FLAG_FULL); fh->ts = htonl((long)(fr->ts)); - fh->oseqno = fr->oseqno; + fh->oseqno = (unsigned char)fr->oseqno; if (transfer) { fh->iseqno = 0; } else - fh->iseqno = fr->iseqno; + fh->iseqno = (unsigned char)fr->iseqno; /* Keep track of the last thing we've acknowledged */ - pvt->aseqno = fr->iseqno; - fh->type = fr->af.frametype & 0xFF; + pvt->aseqno = (unsigned char)fr->iseqno; + fh->type = (char)(fr->af.frametype & 0xFF); fh->csub = compress_subclass(fr->af.subclass); if (transfer) { - fr->dcallno = pvt->transfercallno; + fr->dcallno = (unsigned short)pvt->transfercallno; } else - fr->dcallno = pvt->peercallno; + fr->dcallno = (unsigned short)pvt->peercallno; fh->dcallno = htons(fr->dcallno); fr->datalen = fr->af.datalen + sizeof(struct ast_iax2_full_hdr); fr->data = fh; @@ -1370,11 +1370,11 @@ int iax_setup_transfer(struct iax_session *org_session, struct iax_session *new_ /* reversed setup */ iax_ie_append_addr(&ied0, IAX_IE_APPARENT_ADDR, &s1->peeraddr); - iax_ie_append_short(&ied0, IAX_IE_CALLNO, s1->peercallno); + iax_ie_append_short(&ied0, IAX_IE_CALLNO, (unsigned short)s1->peercallno); iax_ie_append_int(&ied0, IAX_IE_TRANSFERID, transfer_id); iax_ie_append_addr(&ied1, IAX_IE_APPARENT_ADDR, &s0->peeraddr); - iax_ie_append_short(&ied1, IAX_IE_CALLNO, s0->peercallno); + iax_ie_append_short(&ied1, IAX_IE_CALLNO, (unsigned short)s0->peercallno); iax_ie_append_int(&ied1, IAX_IE_TRANSFERID, transfer_id); s0->transfer = s1->peeraddr; @@ -1460,15 +1460,15 @@ static int iax_handle_txready(struct iax_session *s) s->transferring = TRANSFER_REL; s0 = s; - s1 = iax_find_session2(s0->transferpeer); + s1 = iax_find_session2((short)s0->transferpeer); if (s1 != NULL && s1->callno == s0->transferpeer && s0->transferring == TRANSFER_REL && s1->transferring == TRANSFER_REL) { - s0_org_peer = s0->peercallno; - s1_org_peer = s1->peercallno; + s0_org_peer = (short)s0->peercallno; + s1_org_peer = (short)s1->peercallno; iax_finish_transfer(s0, s1_org_peer); iax_finish_transfer(s1, s0_org_peer); @@ -1483,7 +1483,7 @@ static void iax_handle_txreject(struct iax_session *s) struct iax_session *s0, *s1; s0 = s; - s1 = iax_find_session2(s0->transferpeer); + s1 = iax_find_session2((short)s0->transferpeer); if (s1 != NULL && s0->transferpeer == s1->callno && s1->transferring) { @@ -1662,12 +1662,12 @@ int iax_register(struct iax_session *session, char *server, char *peer, char *se return -1; } memcpy(&session->peeraddr.sin_addr, hp->h_addr, sizeof(session->peeraddr.sin_addr)); - session->peeraddr.sin_port = htons(portno); + session->peeraddr.sin_port = htons((unsigned short)portno); session->peeraddr.sin_family = AF_INET; strncpy(session->username, peer, sizeof(session->username) - 1); session->refresh = refresh; iax_ie_append_str(&ied, IAX_IE_USERNAME, (unsigned char *) peer); - iax_ie_append_short(&ied, IAX_IE_REFRESH, refresh); + iax_ie_append_short(&ied, IAX_IE_REFRESH, (unsigned short)refresh); res = send_command(session, AST_FRAME_IAX, IAX_COMMAND_REGREQ, 0, ied.buf, ied.pos, -1); return res; } @@ -1854,7 +1854,7 @@ static int iax_send_txready(struct iax_session *session) struct iax_ie_data ied; memset(&ied, 0, sizeof(ied)); /* see asterisk chan_iax2.c */ - iax_ie_append_short(&ied, IAX_IE_CALLNO, session->callno); + iax_ie_append_short(&ied, IAX_IE_CALLNO, (unsigned short)session->callno); return send_command(session, AST_FRAME_IAX, IAX_COMMAND_TXREADY, 0, ied.buf, ied.pos, -1); } @@ -1887,7 +1887,7 @@ static int iax_regauth_reply(struct iax_session *session, char *password, char * struct iax_ie_data ied; memset(&ied, 0, sizeof(ied)); iax_ie_append_str(&ied, IAX_IE_USERNAME, (unsigned char *) session->username); - iax_ie_append_short(&ied, IAX_IE_REFRESH, session->refresh); + iax_ie_append_short(&ied, IAX_IE_REFRESH, (unsigned short)session->refresh); if ((methods & IAX_AUTHMETHOD_MD5) && challenge) { MD5Init(&md5); MD5Update(&md5, (const unsigned char *) challenge, (unsigned int)strlen(challenge)); @@ -1931,9 +1931,9 @@ int iax_dialplan_request(struct iax_session *session, char *number) static inline int which_bit(unsigned int i) { - char x; + unsigned char x; for(x = 0; x < 32; x++) { - if ((1 << x) == i) { + if ((unsigned)(1 << x) == i) { return x + 1; } } @@ -1943,7 +1943,7 @@ static inline int which_bit(unsigned int i) char iax_pref_codec_add(struct iax_session *session, unsigned int format) { int diff = (int) 'A'; - session->codec_order[session->codec_order_len++] = (which_bit(format)) + diff; + session->codec_order[session->codec_order_len++] = (char)((which_bit(format)) + diff); session->codec_order[session->codec_order_len] = '\0'; return session->codec_order[session->codec_order_len-1]; } @@ -1954,7 +1954,7 @@ void iax_pref_codec_del(struct iax_session *session, unsigned int format) int diff = (int) 'A'; size_t x; char old[32]; - char remove = which_bit(format) + diff; + char remove = (char)(which_bit(format) + diff); strncpy(old, session->codec_order, sizeof(old)); session->codec_order_len = 0; @@ -2083,7 +2083,7 @@ int iax_call(struct iax_session *session, const char *cidnum, const char *cidnam return -1; } memcpy(&session->peeraddr.sin_addr, hp->h_addr, sizeof(session->peeraddr.sin_addr)); - session->peeraddr.sin_port = htons(portno); + session->peeraddr.sin_port = htons((unsigned short)portno); session->peeraddr.sin_family = AF_INET; res = send_command(session, AST_FRAME_IAX, IAX_COMMAND_NEW, 0, ied.buf, ied.pos, -1); if (res < 0) @@ -2984,7 +2984,7 @@ static struct iax_event *iax_net_read(void) struct sockaddr_in sin; sinlen = sizeof(sin); - res = iax_recvfrom(netfd, buf, sizeof(buf), 0, (struct sockaddr *) &sin, &sinlen); + res = iax_recvfrom(netfd, (char *)buf, sizeof(buf), 0, (struct sockaddr *) &sin, &sinlen); if (res < 0) { #ifdef WIN32 @@ -3024,7 +3024,7 @@ static struct iax_session *iax_txcnt_session(struct ast_iax2_full_hdr *fh, int d } iax_mutex_lock(session_mutex); for( cur=sessions; cur; cur=cur->next ) { - if ((cur->transferring) && (cur->transferid == ies.transferid) && + if ((cur->transferring) && (cur->transferid == (int)ies.transferid) && (cur->callno == dcallno) && (cur->transfercallno == callno)) { /* We're transferring --- * skip address/port checking which would fail while remote peer behind symmetric NAT diff --git a/src/mod/endpoints/mod_iax/iax2-parser.c b/src/mod/endpoints/mod_iax/iax2-parser.c index aa72275be7..e4a1a3103a 100644 --- a/src/mod/endpoints/mod_iax/iax2-parser.c +++ b/src/mod/endpoints/mod_iax/iax2-parser.c @@ -33,7 +33,7 @@ #include "iax2.h" #include "iax2-parser.h" -static int frames = 0; +static int frame_count = 0; static int iframes = 0; static int oframes = 0; @@ -391,7 +391,7 @@ void iax_showframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, int rx, s /* Don't mess with mini-frames */ return; } - if (fh->type > (int)sizeof(frames)/(int)sizeof(char *)) { + if (fh->type > ((int)sizeof(frames)/(int)sizeof(char *)) - 1) { snprintf(class2, (int)sizeof(class2), "(%d?)", fh->type); class = class2; } else { @@ -442,7 +442,7 @@ int iax_ie_append_raw(struct iax_ie_data *ied, unsigned char ie, const void *dat return -1; } ied->buf[ied->pos++] = ie; - ied->buf[ied->pos++] = datalen; + ied->buf[ied->pos++] = (unsigned char)datalen; memcpy(ied->buf + ied->pos, data, datalen); ied->pos += datalen; return 0; @@ -492,19 +492,19 @@ void iax_set_error(void (*func)(const char *)) errorf = func; } -int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) +int iax_parse_ies(struct iax_ies *my_ies, unsigned char *data, int datalen) { /* Parse data into information elements */ int len; int ie; char tmp[256]; - memset(ies, 0, (int)sizeof(struct iax_ies)); - ies->msgcount = -1; - ies->firmwarever = -1; - ies->calling_ton = -1; - ies->calling_tns = -1; - ies->calling_pres = -1; - ies->samprate = IAX_RATE_8KHZ; + memset(my_ies, 0, (int)sizeof(struct iax_ies)); + my_ies->msgcount = -1; + my_ies->firmwarever = -1; + my_ies->calling_ton = -1; + my_ies->calling_tns = -1; + my_ies->calling_pres = -1; + my_ies->samprate = IAX_RATE_8KHZ; while(datalen >= 2) { ie = data[0]; len = data[1]; @@ -514,127 +514,127 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) } switch(ie) { case IAX_IE_CALLED_NUMBER: - ies->called_number = (char *) data + 2; + my_ies->called_number = (char *) data + 2; break; case IAX_IE_CALLING_NUMBER: - ies->calling_number = (char *) data + 2; + my_ies->calling_number = (char *) data + 2; break; case IAX_IE_CALLING_ANI: - ies->calling_ani = (char *) data + 2; + my_ies->calling_ani = (char *) data + 2; break; case IAX_IE_CALLING_NAME: - ies->calling_name = (char *) data + 2; + my_ies->calling_name = (char *) data + 2; break; case IAX_IE_CALLED_CONTEXT: - ies->called_context = (char *) data + 2; + my_ies->called_context = (char *) data + 2; break; case IAX_IE_USERNAME: - ies->username = (char *) data + 2; + my_ies->username = (char *) data + 2; break; case IAX_IE_PASSWORD: - ies->password = (char *) data + 2; + my_ies->password = (char *) data + 2; break; case IAX_IE_CAPABILITY: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting capability to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->capability = ntohl(get_uint32(data + 2)); + my_ies->capability = ntohl(get_uint32(data + 2)); break; case IAX_IE_FORMAT: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting format to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->format = ntohl(get_uint32(data + 2)); + my_ies->format = ntohl(get_uint32(data + 2)); break; case IAX_IE_LANGUAGE: - ies->language = (char *) data + 2; + my_ies->language = (char *) data + 2; break; case IAX_IE_CODEC_PREFS: - ies->codec_prefs = (char *) data + 2; + my_ies->codec_prefs = (char *) data + 2; break; case IAX_IE_VERSION: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting version to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->version = ntohs(get_uint16(data + 2)); + my_ies->version = ntohs(get_uint16(data + 2)); break; case IAX_IE_ADSICPE: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting adsicpe to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->adsicpe = ntohs(get_uint16(data + 2)); + my_ies->adsicpe = ntohs(get_uint16(data + 2)); break; case IAX_IE_SAMPLINGRATE: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting samplingrate to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->samprate = ntohs(get_uint16(data + 2)); + my_ies->samprate = ntohs(get_uint16(data + 2)); break; case IAX_IE_DNID: - ies->dnid = (char *) data + 2; + my_ies->dnid = (char *) data + 2; break; case IAX_IE_RDNIS: - ies->rdnis = (char *) data + 2; + my_ies->rdnis = (char *) data + 2; break; case IAX_IE_AUTHMETHODS: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting authmethods to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->authmethods = ntohs(get_uint16(data + 2)); + my_ies->authmethods = ntohs(get_uint16(data + 2)); break; case IAX_IE_CHALLENGE: - ies->challenge = (char *) data + 2; + my_ies->challenge = (char *) data + 2; break; case IAX_IE_MD5_RESULT: - ies->md5_result = (char *) data + 2; + my_ies->md5_result = (char *) data + 2; break; case IAX_IE_RSA_RESULT: - ies->rsa_result = (char *) data + 2; + my_ies->rsa_result = (char *) data + 2; break; case IAX_IE_APPARENT_ADDR: - ies->apparent_addr = ((struct sockaddr_in *)(data + 2)); + my_ies->apparent_addr = ((struct sockaddr_in *)(data + 2)); break; case IAX_IE_REFRESH: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting refresh to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->refresh = ntohs(get_uint16(data + 2)); + my_ies->refresh = ntohs(get_uint16(data + 2)); break; case IAX_IE_DPSTATUS: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting dpstatus to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->dpstatus = ntohs(get_uint16(data + 2)); + my_ies->dpstatus = ntohs(get_uint16(data + 2)); break; case IAX_IE_CALLNO: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting callno to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->callno = ntohs(get_uint16(data + 2)); + my_ies->callno = ntohs(get_uint16(data + 2)); break; case IAX_IE_CAUSE: - ies->cause = (char *) data + 2; + my_ies->cause = (char *) data + 2; break; case IAX_IE_CAUSECODE: if (len != 1) { snprintf(tmp, (int)sizeof(tmp), "Expecting causecode to be single byte but was %d\n", len); errorf(tmp); } else { - ies->causecode = data[2]; + my_ies->causecode = data[2]; } break; case IAX_IE_IAX_UNKNOWN: if (len == 1) - ies->iax_unknown = data[2]; + my_ies->iax_unknown = data[2]; else { snprintf(tmp, (int)sizeof(tmp), "Expected single byte Unknown command, but was %d long\n", len); errorf(tmp); @@ -645,64 +645,64 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expecting msgcount to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->msgcount = ntohs(get_uint16(data + 2)); + my_ies->msgcount = ntohs(get_uint16(data + 2)); break; case IAX_IE_AUTOANSWER: - ies->autoanswer = 1; + my_ies->autoanswer = 1; break; case IAX_IE_MUSICONHOLD: - ies->musiconhold = 1; + my_ies->musiconhold = 1; break; case IAX_IE_TRANSFERID: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting transferid to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->transferid = ntohl(get_uint32(data + 2)); + my_ies->transferid = ntohl(get_uint32(data + 2)); break; case IAX_IE_DATETIME: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expecting date/time to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->datetime = ntohl(get_uint32(data + 2)); + my_ies->datetime = ntohl(get_uint32(data + 2)); break; case IAX_IE_FIRMWAREVER: if (len != (int)sizeof(unsigned short)) { snprintf(tmp, (int)sizeof(tmp), "Expecting firmwarever to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->firmwarever = ntohs(get_uint16(data + 2)); + my_ies->firmwarever = ntohs(get_uint16(data + 2)); break; case IAX_IE_DEVICETYPE: - ies->devicetype = (char *) data + 2; + my_ies->devicetype = (char *) data + 2; break; case IAX_IE_SERVICEIDENT: - ies->serviceident = (char *) data + 2; + my_ies->serviceident = (char *) data + 2; break; case IAX_IE_FWBLOCKDESC: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expected block desc to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else - ies->fwdesc = ntohl(get_uint32(data + 2)); + my_ies->fwdesc = ntohl(get_uint32(data + 2)); break; case IAX_IE_FWBLOCKDATA: - ies->fwdata = data + 2; - ies->fwdatalen = len; + my_ies->fwdata = data + 2; + my_ies->fwdatalen = (unsigned char)len; break; case IAX_IE_PROVVER: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expected provisioning version to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->provverpres = 1; - ies->provver = ntohl(get_uint32(data + 2)); + my_ies->provverpres = 1; + my_ies->provver = ntohl(get_uint32(data + 2)); } break; case IAX_IE_CALLINGPRES: if (len == 1) - ies->calling_pres = data[2]; + my_ies->calling_pres = data[2]; else { snprintf(tmp, (int)sizeof(tmp), "Expected single byte callingpres, but was %d long\n", len); errorf(tmp); @@ -710,7 +710,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) break; case IAX_IE_CALLINGTON: if (len == 1) - ies->calling_ton = data[2]; + my_ies->calling_ton = data[2]; else { snprintf(tmp, (int)sizeof(tmp), "Expected single byte callington, but was %d long\n", len); errorf(tmp); @@ -721,14 +721,14 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expecting callingtns to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->calling_tns = ntohs(get_uint16(data + 2)); + my_ies->calling_tns = ntohs(get_uint16(data + 2)); break; case IAX_IE_RR_JITTER: if (len != (int)sizeof(unsigned int)) { snprintf(tmp, (int)sizeof(tmp), "Expected jitter rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_jitter = ntohl(get_uint32(data + 2)); + my_ies->rr_jitter = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_LOSS: @@ -736,7 +736,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expected loss rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_loss = ntohl(get_uint32(data + 2)); + my_ies->rr_loss = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_PKTS: @@ -744,7 +744,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expected packets rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_pkts = ntohl(get_uint32(data + 2)); + my_ies->rr_pkts = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_DELAY: @@ -752,7 +752,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expected loss rr to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else { - ies->rr_delay = ntohs(get_uint16(data + 2)); + my_ies->rr_delay = ntohs(get_uint16(data + 2)); } break; case IAX_IE_RR_DROPPED: @@ -760,7 +760,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expected packets rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_dropped = ntohl(get_uint32(data + 2)); + my_ies->rr_dropped = ntohl(get_uint32(data + 2)); } break; case IAX_IE_RR_OOO: @@ -768,7 +768,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expected packets rr to be %d bytes long but was %d\n", (int)sizeof(unsigned int), len); errorf(tmp); } else { - ies->rr_ooo = ntohl(get_uint32(data + 2)); + my_ies->rr_ooo = ntohl(get_uint32(data + 2)); } break; default: @@ -810,7 +810,7 @@ struct iax_frame *iax_frame_new(int direction, int datalen) if (fr) { fr->direction = direction; fr->retrans = -1; - frames++; + frame_count++; if (fr->direction == DIRECTION_INGRESS) iframes++; else @@ -832,9 +832,9 @@ void iax_frame_free(struct iax_frame *fr) } fr->direction = 0; free(fr); - frames--; + frame_count--; } -int iax_get_frames(void) { return frames; } +int iax_get_frames(void) { return frame_count; } int iax_get_iframes(void) { return iframes; } int iax_get_oframes(void) { return oframes; } diff --git a/src/mod/endpoints/mod_iax/jitterbuf.c b/src/mod/endpoints/mod_iax/jitterbuf.c index 8775d916fc..4b7edd0d4c 100644 --- a/src/mod/endpoints/mod_iax/jitterbuf.c +++ b/src/mod/endpoints/mod_iax/jitterbuf.c @@ -84,23 +84,20 @@ void jb_reset(jitterbuf *jb) jitterbuf * jb_new() { - jitterbuf *jb; + jitterbuf *jb = (jitterbuf *)malloc(sizeof(*jb)); - if (!(jb = (jitterbuf *)malloc(sizeof(*jb)))) - return NULL; + if (!jb) return NULL; jb->info.conf.target_extra = JB_TARGET_EXTRA; jb_reset(jb); - jb_dbg2("jb_new() = %x\n", jb); return jb; } void jb_destroy(jitterbuf *jb) { jb_frame *frame; - jb_dbg2("jb_destroy(%x)\n", jb); /* free all the frames on the "free list" */ frame = jb->free; @@ -127,7 +124,7 @@ static int longcmp(const void *a, const void *b) /* maybe later we can make the history buckets variable size, or something? */ /* drop parameter determines whether we will drop outliers to minimize * delay */ -static int history_put(jitterbuf *jb, time_in_ms_t ts, time_in_ms_t now, long ms) +static int history_put(jitterbuf *jb, time_in_ms_t ts, time_in_ms_t now) { time_in_ms_t delay = now - (ts - jb->info.resync_offset); time_in_ms_t threshold = 2 * jb->info.jitter + jb->info.conf.resync_threshold; @@ -326,16 +323,19 @@ static void history_get(jitterbuf *jb) /* returns 1 if frame was inserted into head of queue, 0 otherwise */ static int queue_put(jitterbuf *jb, void *data, const enum jb_frame_type type, long ms, time_in_ms_t ts) { - jb_frame *frame; + jb_frame *frame = jb->free; jb_frame *p; int head = 0; time_in_ms_t resync_ts = ts - jb->info.resync_offset; - if ((frame = jb->free)) { + if (frame) { jb->free = frame->next; - } else if (!(frame = (jb_frame *)malloc(sizeof(*frame)))) { - jb_err("cannot allocate frame\n"); - return 0; + } else { + frame = (jb_frame *)malloc(sizeof(*frame)); + if (!frame) { + jb_err("cannot allocate frame\n"); + return 0; + } } jb->info.frames_cur++; @@ -514,8 +514,6 @@ static void jb_dbgqueue(jitterbuf *jb) enum jb_return_code jb_put(jitterbuf *jb, void *data, const enum jb_frame_type type, long ms, time_in_ms_t ts, time_in_ms_t now) { - jb_dbg2("jb_put(%x,%x,%ld,%ld,%ld)\n", jb, data, ms, ts, now); - jb->info.frames_in++; if (type == JB_TYPE_VOICE) { @@ -524,7 +522,7 @@ enum jb_return_code jb_put(jitterbuf *jb, void *data, const enum jb_frame_type t * sending retransmitted control frames with their awkward * timestamps through */ - if (history_put(jb,ts,now,ms)) + if (history_put(jb,ts,now)) return JB_DROP; } diff --git a/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj b/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj index 0cf8917339..fa143378c8 100644 --- a/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj +++ b/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj @@ -40,10 +40,10 @@ + + + + + + + + + + diff --git a/src/mod/endpoints/mod_iax/mod_iax.vcproj b/src/mod/endpoints/mod_iax/mod_iax.vcproj index b1574ea7d4..7314c8bf29 100644 --- a/src/mod/endpoints/mod_iax/mod_iax.vcproj +++ b/src/mod/endpoints/mod_iax/mod_iax.vcproj @@ -6,6 +6,7 @@ ProjectGUID="{3A5B9131-F20C-4A85-9447-6C1610941CEE}" RootNamespace="mod_iax" Keyword="Win32Proj" + TargetFrameworkVersion="131072" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mod/endpoints/mod_iax/winiphone.c b/src/mod/endpoints/mod_iax/winiphone.c deleted file mode 100644 index 0bc3147b7c..0000000000 --- a/src/mod/endpoints/mod_iax/winiphone.c +++ /dev/null @@ -1,761 +0,0 @@ -/* - * Miniphone: A simple, command line telephone - * - * IAX Support for talking to Asterisk and other Gnophone clients - * - * Copyright (C) 1999, Linux Support Services, Inc. - * - * Mark Spencer - * - * This program is free software, distributed under the terms of - * the GNU General Public License - */ - -/* #define PRINTCHUCK /* enable this to indicate chucked incomming packets */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "gsm.h" -#include "iax-client.h" -#include "frame.h" -#include "miniphone.h" - - -struct peer { - int time; - gsm gsmin; - gsm gsmout; - - struct iax_session *session; - struct peer *next; -}; - -static struct peer *peers; -static int answered_call = 0; - -/* stuff for wave audio device */ -HWAVEOUT wout; -HWAVEIN win; - -typedef struct whout { - WAVEHDR w; - short data[160]; - struct whout *next; -} WHOUT; - -WHOUT *outqueue = NULL; - -/* parameters for audio in */ -#define NWHIN 8 /* number of input buffer entries */ -/* NOTE the OUT_INTERVAL parameter *SHOULD* be more around 18 to 20 or so, since the packets should -be spaced by 20 milliseconds. However, in practice, especially in Windoze-95, setting it that high -caused underruns. 10 is just ever so slightly agressive, and the receiver has to chuck a packet -every now and then. Thats about the way it should be to be happy. */ -#define OUT_INTERVAL 10 /* number of ms to wait before sending more data to peer */ -/* parameters for audio out */ -#define OUT_DEPTH 12 /* number of outbut buffer entries */ -#define OUT_PAUSE_THRESHOLD 2 /* number of active entries needed to start output (for smoothing) */ - -/* audio input buffer headers */ -WAVEHDR whin[NWHIN]; -/* audio input buffers */ -char bufin[NWHIN][320]; - -/* initialize the sequence variables for the audio in stuff */ -unsigned int whinserial = 1,nextwhin = 1; - -static struct peer *find_peer(struct iax_session *); -static void parse_args(FILE *, unsigned char *); -void do_iax_event(FILE *); -void call(FILE *, char *); -void answer_call(void); -void reject_call(void); -static void handle_event(FILE *, struct iax_event *e, struct peer *p); -void parse_cmd(FILE *, int, char **); -void issue_prompt(FILE *); -void dump_array(FILE *, char **); - -static char *help[] = { -"Welcome to the miniphone telephony client, the commands are as follows:\n", -"Help\t\t-\tDisplays this screen.", -"Call \t-\tDials the number supplied.", -"Answer\t\t-\tAnswers an Inbound call.", -"Reject\t\t-\tRejects an Inbound call.", -"Dump\t\t-\tDumps (disconnects) the current call.", -"Dtmf \t-\tSends specified DTMF digit.", -"Status\t\t-\tLists the current sessions and their current status.", -"Quit\t\t-\tShuts down the client.", -"", -0 -}; - -static struct peer *most_recent_answer; -static struct iax_session *newcall = 0; - -/* holder of the time, relative to startup in system ticks. See our -gettimeofday() implementation */ -time_t startuptime; - -/* routine called at exit to shutdown audio I/O and close nicely. -NOTE: If all this isnt done, the system doesnt not handle this -cleanly and has to be rebooted. What a pile of doo doo!! */ -void killem(void) -{ - waveInStop(win); - waveInReset(win); - waveInClose(win); - waveOutReset(wout); - waveOutClose(wout); - WSACleanup(); /* dont forget socket stuff too */ - return; -} - -/* Win-doze doenst have gettimeofday(). This sux. So, what we did is -provide some gettimeofday-like functionality that works for our purposes. -In the main(), we take a sample of the system tick counter (into startuptime). -This function returns the relative time since program startup, more or less, -which is certainly good enough for our purposes. */ -void gettimeofday(struct timeval *tv, struct timezone *tz) -{ - long l = startuptime + GetTickCount(); - - tv->tv_sec = l / 1000; - tv->tv_usec = (l % 1000) * 1000; - return; -} - - -static struct peer *find_peer(struct iax_session *session) -{ - struct peer *cur = peers; - while(cur) { - if (cur->session == session) - return cur; - cur = cur->next; - } - return NULL; -} - -void -parse_args(FILE *f, unsigned char *cmd) -{ - static char *argv[MAXARGS]; - unsigned char *parse = cmd; - int argc = 0, t = 0; - - // Don't mess with anything that doesn't exist... - if(!*parse) - return; - - memset(argv, 0, sizeof(argv)); - while(*parse) { - if(*parse < 33 || *parse > 128) { - *parse = 0, t++; - if(t > MAXARG) { - fprintf(f, "Warning: Argument exceeds maximum argument size, command ignored!\n"); - return; - } - } else if(t || !argc) { - if(argc == MAXARGS) { - fprintf(f, "Warning: Command ignored, too many arguments\n"); - return; - } - argv[argc++] = parse; - t = 0; - } - - parse++; - } - - if(argc) - parse_cmd(f, argc, argv); -} - -/* handle all network requests, and a pending scheduled event, if any */ -void service_network(int netfd, FILE *f) -{ - fd_set readfd; - struct timeval dumbtimer; - - /* set up a timer that falls-through */ - dumbtimer.tv_sec = 0; - dumbtimer.tv_usec = 0; - - - for(;;) /* suck everything outa network stuff */ - { - FD_ZERO(&readfd); - FD_SET(netfd, &readfd); - if (select(netfd + 1, &readfd, 0, 0, &dumbtimer) > 0) - { - if (FD_ISSET(netfd,&readfd)) - { - do_iax_event(f); - (void) iax_time_to_next_event(); - } else break; - } else break; - } - do_iax_event(f); /* do pending event if any */ -} - - -int -main(int argc, char *argv[]) -{ - int port; - int netfd; - int c, i; - FILE *f; - char rcmd[RBUFSIZE]; - gsm_frame fo; - WSADATA foop; - time_t t; - WAVEFORMATEX wf; - WHOUT *wh,*wh1,*wh2; - unsigned long lastouttick = 0; - - - - /* get time of day in milliseconds, offset by tick count (see our - gettimeofday() implementation) */ - time(&t); - startuptime = ((t % 86400) * 1000) - GetTickCount(); - - f = stdout; - _dup2(fileno(stdout),fileno(stderr)); - - /* start up the windoze-socket layer stuff */ - if (WSAStartup(0x0101,&foop)) { - fprintf(stderr,"Fatal error: Falied to startup windows sockets\n"); - return -1; - } - - - /* setup the format for opening audio channels */ - wf.wFormatTag = WAVE_FORMAT_PCM; - wf.nChannels = 1; - wf.nSamplesPerSec = 8000; - wf.nAvgBytesPerSec = 16000; - wf.nBlockAlign = 2; - wf.wBitsPerSample = 16; - wf.cbSize = 0; - /* open the audio out channel */ - if (waveOutOpen(&wout,0,&wf,0,0,CALLBACK_NULL) != MMSYSERR_NOERROR) - { - fprintf(stderr,"Fatal Error: Failed to open wave output device\n"); - return -1; - } - /* open the audio in channel */ - if (waveInOpen(&win,0,&wf,0,0,CALLBACK_NULL) != MMSYSERR_NOERROR) - { - fprintf(stderr,"Fatal Error: Failed to open wave input device\n"); - waveOutReset(wout); - waveOutClose(wout); - return -1; - } - /* activate the exit handler */ - atexit(killem); - /* initialize the audio in buffer structures */ - memset(&whin,0,sizeof(whin)); - - if ( (port = iax_init(0) < 0)) { - fprintf(stderr, "Fatal error: failed to initialize iax with port %d\n", port); - return -1; - } - - - iax_set_formats(AST_FORMAT_GSM); - netfd = iax_get_fd(); - - fprintf(f, "Text Based Telephony Client.\n\n"); - issue_prompt(f); - - /* main tight loop */ - while(1) { - /* service the network stuff */ - service_network(netfd,f); - if (outqueue) /* if stuff in audio output queue, free it up if its available */ - { - /* go through audio output queue */ - for(wh = outqueue,wh1 = wh2 = NULL,i = 0; wh != NULL; wh = wh->next) - { - service_network(netfd,f); /* service network here for better performance */ - /* if last one was removed from queue, zot it here */ - if (i && wh1) - { - free(wh1); - wh1 = wh2; - } - i = 0; /* reset "last one removed" flag */ - if (wh->w.dwFlags & WHDR_DONE) /* if this one is done */ - { - /* prepare audio header */ - if ((c = waveOutUnprepareHeader(wout,&wh->w,sizeof(WAVEHDR))) != MMSYSERR_NOERROR) - { - fprintf(stderr,"Cannot unprepare audio out header, error %d\n",c); - exit(255); - } - if (wh1 != NULL) /* if there was a last one */ - { - wh1->next = wh->next; - } - if (outqueue == wh) /* is first one, so set outqueue to next one */ - { - outqueue = wh->next; - } - i = 1; /* set 'to free' flag */ - } - wh2 = wh1; /* save old,old wh pointer */ - wh1 = wh; /* save the old wh pointer */ - } - } - /* go through all audio in buffers, and prepare and queue ones that are currently idle */ - for(i = 0; i < NWHIN; i++) - { - service_network(netfd,f); /* service network stuff here for better performance */ - if (!(whin[i].dwFlags & WHDR_PREPARED)) /* if not prepared, do so */ - { - /* setup this input buffer header */ - memset(&whin[i],0,sizeof(WAVEHDR)); - whin[i].lpData = bufin[i]; - whin[i].dwBufferLength = 320; - whin[i].dwUser = whinserial++; /* set 'user data' to current serial number */ - /* prepare the buffer */ - if (waveInPrepareHeader(win,&whin[i],sizeof(WAVEHDR))) - { - fprintf(stderr,"Unable to prepare header for input\n"); - return -1; - } - /* add it to device (queue) */ - if (waveInAddBuffer(win,&whin[i],sizeof(WAVEHDR))) - { - fprintf(stderr,"Unable to prepare header for input\n"); - return -1; - } - } - waveInStart(win); /* start it (if not already started) */ - } - - /* if key pressed, do command stuff */ - if(_kbhit()) - { - if ( ( fgets(&*rcmd, 256, stdin))) { - rcmd[strlen(rcmd)-1] = 0; - parse_args(f, &*rcmd); - } else fprintf(f, "Fatal error: failed to read data!\n"); - - issue_prompt(f); - } - /* do audio input stuff for buffers that have received data from audio in device already. Must - do them in serial number order (the order in which they were originally queued). */ - if(answered_call) /* send audio only if call answered */ - { - for(;;) /* loop until all are found */ - { - for(i = 0; i < NWHIN; i++) /* find an available one that's the one we are looking for */ - { - service_network(netfd,f); /* service network here for better performance */ - /* if not time to send any more, dont */ - if (GetTickCount() < (lastouttick + OUT_INTERVAL)) - { - i = NWHIN; /* set to value that WILL exit loop */ - break; - } - if ((whin[i].dwUser == nextwhin) && (whin[i].dwFlags & WHDR_DONE)) { /* if audio is ready */ - - /* must have read exactly 320 bytes */ - if (whin[i].dwBytesRecorded != whin[i].dwBufferLength) - { - fprintf(stderr,"Short audio read, got %d bytes, expected %d bytes\n", whin[i].dwBytesRecorded, - whin[i].dwBufferLength); - return -1; - } - if(!most_recent_answer->gsmout) - most_recent_answer->gsmout = gsm_create(); - - service_network(netfd,f); /* service network here for better performance */ - /* encode the audio from the buffer into GSM format */ - gsm_encode(most_recent_answer->gsmout, (short *) ((char *) whin[i].lpData), fo); - if(iax_send_voice(most_recent_answer->session, - AST_FORMAT_GSM, (char *)fo, sizeof(gsm_frame)) == -1) - puts("Failed to send voice!"); - lastouttick = GetTickCount(); /* save time of last output */ - - /* unprepare (free) the header */ - waveInUnprepareHeader(win,&whin[i],sizeof(WAVEHDR)); - /* initialize the buffer */ - memset(&whin[i],0,sizeof(WAVEHDR)); - /* bump the serial number to look for the next time */ - nextwhin++; - /* exit the loop so that we can start at lowest buffer again */ - break; - } - } - if (i >= NWHIN) break; /* if all found, get out of loop */ - } - } - - } - return 0; -} - -void -do_iax_event(FILE *f) { - int sessions = 0; - struct iax_event *e = 0; - struct peer *peer; - - while ( (e = iax_get_event(0))) { - peer = find_peer(e->session); - if(peer) { - handle_event(f, e, peer); - } else { - if(e->etype != IAX_EVENT_CONNECT) { - fprintf(stderr, "Huh? This is an event for a non-existant session?\n"); - } - sessions++; - - if(sessions >= MAX_SESSIONS) { - fprintf(f, "Missed a call... too many sessions open.\n"); - } - - - if(e->event.connect.callerid && e->event.connect.dnid) - fprintf(f, "Call from '%s' for '%s'", e->event.connect.callerid, - e->event.connect.dnid); - else if(e->event.connect.dnid) { - fprintf(f, "Call from '%s'", e->event.connect.dnid); - } else if(e->event.connect.callerid) { - fprintf(f, "Call from '%s'", e->event.connect.callerid); - } else printf("Call from"); - fprintf(f, " (%s)\n", inet_ntoa(iax_get_peer_addr(e->session).sin_addr)); - - if(most_recent_answer) { - fprintf(f, "Incoming call ignored, there's already a call waiting for answer... \ -please accept or reject first\n"); - iax_reject(e->session, "Too many calls, we're busy!"); - } else { - if ( !(peer = malloc(sizeof(struct peer)))) { - fprintf(f, "Warning: Unable to allocate memory!\n"); - return; - } - - peer->time = time(0); - peer->session = e->session; - peer->gsmin = 0; - peer->gsmout = 0; - - peer->next = peers; - peers = peer; - - iax_accept(peer->session); - iax_ring_announce(peer->session); - most_recent_answer = peer; - fprintf(f, "Incoming call!\n"); - } - iax_event_free(e); - issue_prompt(f); - } - } -} - -void -call(FILE *f, char *num) -{ - struct peer *peer; - - if(!newcall) - newcall = iax_session_new(); - else { - fprintf(f, "Already attempting to call somewhere, please cancel first!\n"); - return; - } - - if ( !(peer = malloc(sizeof(struct peer)))) { - fprintf(f, "Warning: Unable to allocate memory!\n"); - return; - } - - peer->time = time(0); - peer->session = newcall; - peer->gsmin = 0; - peer->gsmout = 0; - - peer->next = peers; - peers = peer; - - most_recent_answer = peer; - - iax_call(peer->session, num, 10); -} - -void -answer_call(void) -{ - if(most_recent_answer) - iax_answer(most_recent_answer->session); - printf("Answering call!\n"); - answered_call = 1; -} - -void -dump_call(void) -{ - if(most_recent_answer) - { - iax_hangup(most_recent_answer->session,""); - free(most_recent_answer); - } - printf("Dumping call!\n"); - answered_call = 0; - most_recent_answer = 0; - answered_call = 0; - peers = 0; - newcall = 0; -} - -void -reject_call(void) -{ - iax_reject(most_recent_answer->session, "Call rejected manually."); - most_recent_answer = 0; -} - -void -handle_event(FILE *f, struct iax_event *e, struct peer *p) -{ - int len,n; - WHOUT *wh,*wh1; - short fr[160]; - static paused_xmit = 0; - - - switch(e->etype) { - case IAX_EVENT_HANGUP: - iax_hangup(most_recent_answer->session, "Byeee!"); - fprintf(f, "Call disconnected by peer\n"); - free(most_recent_answer); - most_recent_answer = 0; - answered_call = 0; - peers = 0; - newcall = 0; - - break; - - case IAX_EVENT_REJECT: - fprintf(f, "Authentication was rejected\n"); - break; - case IAX_EVENT_ACCEPT: - fprintf(f, "Waiting for answer... RING RING\n"); - issue_prompt(f); - break; - case IAX_EVENT_ANSWER: - answer_call(); - break; - case IAX_EVENT_VOICE: - switch(e->event.voice.format) { - case AST_FORMAT_GSM: - if(e->event.voice.datalen % 33) { - fprintf(stderr, "Weird gsm frame, not a multiple of 33.\n"); - break; - } - - if (!p->gsmin) - p->gsmin = gsm_create(); - - len = 0; - while(len < e->event.voice.datalen) { - if(gsm_decode(p->gsmin, (char *) e->event.voice.data + len, fr)) { - fprintf(stderr, "Bad GSM data\n"); - break; - } else { /* its an audio packet to be output to user */ - - /* get count of pending items in audio output queue */ - n = 0; - if (outqueue) - { /* determine number of pending out queue items */ - for(wh = outqueue; wh != NULL; wh = wh->next) - { - if (!(wh->w.dwFlags & WHDR_DONE)) n++; - } - } - /* if not too many, send to user, otherwise chuck packet */ - if (n <= OUT_DEPTH) /* if not to chuck packet */ - { - /* malloc the memory for the queue item */ - wh = (WHOUT *) malloc(sizeof(WHOUT)); - if (wh == (WHOUT *) NULL) /* if error, bail */ - { - fprintf(stderr,"Outa memory!!!!\n"); - exit(255); - } - /* initialize the queue entry */ - memset(wh,0,sizeof(WHOUT)); - /* copy the PCM data from the gsm conversion buffer */ - memcpy((char *)wh->data,(char *)fr,sizeof(fr)); - /* set parameters for data */ - wh->w.lpData = (char *) wh->data; - wh->w.dwBufferLength = 320; - - /* prepare buffer for output */ - if (waveOutPrepareHeader(wout,&wh->w,sizeof(WAVEHDR))) - { - fprintf(stderr,"Cannot prepare header for audio out\n"); - exit(255); - } - /* if not currently transmitting, hold off a couple of packets for - smooth sounding output */ - if ((!n) && (!paused_xmit)) - { - /* pause output (before starting) */ - waveOutPause(wout); - /* indicate as such */ - paused_xmit = 1; - } - /* queue packet for output on audio device */ - if (waveOutWrite(wout,&wh->w,sizeof(WAVEHDR))) - { - fprintf(stderr,"Cannot output to wave output device\n"); - exit(255); - } - /* if we are paused, and we have enough packets, start audio */ - if ((n > OUT_PAUSE_THRESHOLD) && paused_xmit) - { - /* start the output */ - waveOutRestart(wout); - /* indicate as such */ - paused_xmit = 0; - } - /* insert it onto tail of outqueue */ - if (outqueue == NULL) /* if empty queue */ - outqueue = wh; /* point queue to new entry */ - else /* otherwise is non-empty queue */ - { - wh1 = outqueue; - while(wh1->next) wh1 = wh1->next; /* find last entry in queue */ - wh1->next = wh; /* point it to new entry */ - } - } -#ifdef PRINTCHUCK - else printf("Chucking packet!!\n"); -#endif - } - len += 33; - } - break; - default : - fprintf(f, "Don't know how to handle that format %d\n", e->event.voice.format); - } - break; - case IAX_EVENT_RINGA: - break; - default: - fprintf(f, "Unknown event: %d\n", e->etype); - break; - } -} - -void -parse_cmd(FILE *f, int argc, char **argv) -{ - _strupr(argv[0]); - if(!strcmp(argv[0], "HELP")) { - if(argc == 1) - dump_array(f, help); - else if(argc == 2) { - if(!strcmp(argv[1], "HELP")) - fprintf(f, "Help \t-\tDisplays general help or specific help on command if supplied an arguement\n"); - else if(!strcmp(argv[1], "QUIT")) - fprintf(f, "Quit\t\t-\tShuts down the miniphone\n"); - else fprintf(f, "No help available on %s\n", argv[1]); - } else { - fprintf(f, "Too many arguements for command help.\n"); - } - } else if(!strcmp(argv[0], "STATUS")) { - if(argc == 1) { - int c = 0; - struct peer *peerptr = peers; - - if(!peerptr) - fprintf(f, "No session matches found.\n"); - else while(peerptr) { - fprintf(f, "Listing sessions:\n\n"); - fprintf(f, "Session %d\n", ++c); - fprintf(f, "Session existed for %d seconds\n", (int)time(0)-peerptr->time); - if(answered_call) - fprintf(f, "Call answered.\n"); - else fprintf(f, "Call ringing.\n"); - - peerptr = peerptr->next; - } - } else fprintf(f, "Too many arguments for command status.\n"); - } else if(!strcmp(argv[0], "ANSWER")) { - if(argc > 1) - fprintf(f, "Too many arguements for command answer\n"); - else answer_call(); - } else if(!strcmp(argv[0], "REJECT")) { - if(argc > 1) - fprintf(f, "Too many arguements for command reject\n"); - else { - fprintf(f, "Rejecting current phone call.\n"); - reject_call(); - } - } else if(!strcmp(argv[0], "CALL")) { - if(argc > 2) - fprintf(f, "Too many arguements for command call\n"); - else { - call(f, argv[1]); - } - } else if(!strcmp(argv[0], "DUMP")) { - if(argc > 1) - fprintf(f, "Too many arguements for command dump\n"); - else { - dump_call(); - } - } else if(!strcmp(argv[0], "DTMF")) { - if(argc > 2) - { - fprintf(f, "Too many arguements for command dtmf\n"); - return; - } - if (argc < 1) - { - fprintf(f, "Too many arguements for command dtmf\n"); - return; - } - if(most_recent_answer) - iax_send_dtmf(most_recent_answer->session,*argv[1]); - } else if(!strcmp(argv[0], "QUIT")) { - if(argc > 1) - fprintf(f, "Too many arguements for command quit\n"); - else { - fprintf(f, "Good bye!\n"); - exit(1); - } - } else fprintf(f, "Unknown command of %s\n", argv[0]); -} - -void -issue_prompt(FILE *f) -{ - fprintf(f, "TeleClient> "); - fflush(f); -} - -void -dump_array(FILE *f, char **array) { - while(*array) - fprintf(f, "%s\n", *array++); -} diff --git a/w32/Setup/Setup.vdproj b/w32/Setup/Setup.vdproj index f82cff38c0..a8fc186153 100644 --- a/w32/Setup/Setup.vdproj +++ b/w32/Setup/Setup.vdproj @@ -27,318 +27,6 @@ } "Entry" { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_0772289C2CC6435396616D7A2C407EA2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_BA769056DBAF4259B38F5C3FF7377055" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_A8D70CB0D12C4B3FB2E2E896E9A7C843" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_78F060A241D0428998B42093C467AD36" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_9527B92C45BB45629BDB19ED3C8DC194" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_FBD45C36E901435399634CACA5339597" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_FBB0E565B1DE49CE9C827ACAC337AC5B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_FB1B9FBDC3294F1C96DAC4246C013C22" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_EC4922AEC1064C90B96EBBDD3104D761" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_EAF4B051F44745ABA9B58038FB93994C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_E763C699DF0948B6984DDEB96A2DFD06" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_E1AA7C5B96DA4A26859D2C7A21E00AB6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D6F0F5845FAD4707975CE012A33CD607" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_D0BB09AFB8D94B76918F0EE85BCCAD0A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_C105055EE271471A999CE7022E617EB7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_C1036825E1364537B537E542E71F9C0E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_BB99CEDF341D40F3976B6D5486D9366D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_B5542B260CD5493395871EFDE833E438" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_9B19C40442134D69B533E16D0851D99B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_96F8F7DE89C74DC399E8AE55C22B4F15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_95D01083472B4853AC3F06514558F347" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_8E023477B9DC4126921A556B285B29E5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_8B53F026686B44189676CBC200E641C1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_77550ABD8CC84D66A3B6C3C3C48665A4" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_6E5C001E7A314DCEA0A4BF52BF74BCAD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_6DF726E4018A4136BC27E2C6F4B67B9E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_5EDFD5418DD243D1A03D882B83BBBCF1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_3E37631016BC45B2B672FE23257D542B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_3DB5A5EF1E624F999BCEA20250508EEA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2D9E612823084E3F9E10376A7AC0C476" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2B80DCCD934745B1BB4F0B31099094D9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_297D0BADB993435092DDB8CDF9F2A3C6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_1DCA6B2BA0F842FDB5CBA54CF52228F7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_1777CB4B737E4B8481E25A10950B2B5A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "OwnerKey" = "8:_166BDBE308F54EE4881DA68F2A8189F5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_103209E575C54D649DD1472DBB9B5F5D" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -393,6 +81,18 @@ } "Entry" { + "MsmKey" = "8:_22F4FC6A582C42A0817BA85C8FEBAA18" + "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_22F4FC6A582C42A0817BA85C8FEBAA18" + "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_27E8189E01B6420CB898CC51360C83A3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -519,12 +219,6 @@ } "Entry" { - "MsmKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_4132509BFE93497C8E86E017E5B98F69" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -633,12 +327,6 @@ } "Entry" { - "MsmKey" = "8:_6A4CAD73F43678BF7C05E8FB41042F74" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_6AA8D6AF639F4E6B92D28A7E0D13FD5E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -729,12 +417,36 @@ } "Entry" { + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7B1050643E1E48A3B67B281B4AD43904" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_7BBFE2768ACD3A62F3874EF99D16C0B8" + "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_7CFCCDD9C6694A0498D7CD6CDD285042" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -753,12 +465,6 @@ } "Entry" { - "MsmKey" = "8:_7FDBEDFAE608481684258301B02CFD1C" - "OwnerKey" = "8:_0CDD28A9559445CE96186F5FB19F690B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_7FEA1E60C11343F1A98DC33C512051FA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -807,30 +513,6 @@ } "Entry" { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_3FBEFE0119944C6781F81104ECEF37CA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_879085EF680EFDF6242DCB77439EC825" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_8B53F026686B44189676CBC200E641C1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -855,12 +537,6 @@ } "Entry" { - "MsmKey" = "8:_91BA2668F87764F53188E93BC8D363D7" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_92F95219F6434CE3A736526946DA2ABB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -939,12 +615,6 @@ } "Entry" { - "MsmKey" = "8:_A164EF86C4B57E41C8CE77B48F39DAC7" - "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A3936A2727E73289F5804D5DA006FD0A" "OwnerKey" = "8:_28FBC5A60B44423B8A2CC378347483CE" "MsmSig" = "8:_UNDEFINED" @@ -1023,6 +693,12 @@ } "Entry" { + "MsmKey" = "8:_B540FA32E4F6382CF1426D13A0A4E6B7" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B5542B260CD5493395871EFDE833E438" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1083,6 +759,12 @@ } "Entry" { + "MsmKey" = "8:_BFD1EC957C5DBC08B54E6594C7CC5F91" + "OwnerKey" = "8:_D2EF447106B24E67907DAED3D39CFBB1" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_C1036825E1364537B537E542E71F9C0E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1119,12 +801,6 @@ } "Entry" { - "MsmKey" = "8:_CB7CBDD38519056FAA16312EEF6BCAF7" - "OwnerKey" = "8:_BA769056DBAF4259B38F5C3FF7377055" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_CCAC35C9D0644917A28341E382DB6B93" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1167,14 +843,14 @@ } "Entry" { - "MsmKey" = "8:_D7E82DD20D5B47395F635480C8E3A1D3" - "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF" + "MsmKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D7EC5795A9C645AC8E129C2EE6D461ED" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_DC30A9FB71F9449BAF1F5981E3538D1E" + "OwnerKey" = "8:_22F4FC6A582C42A0817BA85C8FEBAA18" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1191,12 +867,6 @@ } "Entry" { - "MsmKey" = "8:_E1CC91FCF87955D17FC3C0A8E875B690" - "OwnerKey" = "8:_59CFED0C4EC0492C945E4EBC04FE965F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E5C5D9225978484CA7AD0BD78C1222EE" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1534,7 +1204,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1273F63008CF585CA0E063E436B4646F" { - "SourcePath" = "8:iphlpapi.dll" + "SourcePath" = "8:IPHLPAPI.DLL" "TargetName" = "8:iphlpapi.dll" "Tag" = "8:" "Folder" = "8:_06036160035041E38F4179E6DB6380C5" @@ -2132,26 +1802,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6A4CAD73F43678BF7C05E8FB41042F74" - { - "SourcePath" = "8:libteletone.dll" - "TargetName" = "8:libteletone.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6AA8D6AF639F4E6B92D28A7E0D13FD5E" { "SourcePath" = "8:..\\..\\conf\\dialplan\\extensions\\sipphone.com.noload" @@ -2372,6 +2022,46 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7A08061CFF2F14AC1D5A1B4592BEDB6D" + { + "SourcePath" = "8:libapr.dll" + "TargetName" = "8:libapr.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7BBFE2768ACD3A62F3874EF99D16C0B8" + { + "SourcePath" = "8:FreeSwitch.dll" + "TargetName" = "8:FreeSwitch.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7CFCCDD9C6694A0498D7CD6CDD285042" { "SourcePath" = "8:..\\..\\conf\\lang\\de\\de.xml" @@ -2592,26 +2282,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_879085EF680EFDF6242DCB77439EC825" - { - "SourcePath" = "8:libapr.dll" - "TargetName" = "8:libapr.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8FB175B8685A47F7BE75E1A025F65693" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\limit.conf.xml" @@ -2652,26 +2322,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_91BA2668F87764F53188E93BC8D363D7" - { - "SourcePath" = "8:libapriconv.dll" - "TargetName" = "8:libapriconv.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_92F95219F6434CE3A736526946DA2ABB" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\event_socket.conf.xml" @@ -2832,26 +2482,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A164EF86C4B57E41C8CE77B48F39DAC7" - { - "SourcePath" = "8:libaprutil.dll" - "TargetName" = "8:libaprutil.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3936A2727E73289F5804D5DA006FD0A" { "SourcePath" = "8:RPCRT4.dll" @@ -2952,6 +2582,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B540FA32E4F6382CF1426D13A0A4E6B7" + { + "SourcePath" = "8:libteletone.dll" + "TargetName" = "8:libteletone.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B5ADB663C7CE49A1A11E895E4EBB4933" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\zeroconf.conf.xml" @@ -3072,6 +2722,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BFD1EC957C5DBC08B54E6594C7CC5F91" + { + "SourcePath" = "8:libaprutil.dll" + "TargetName" = "8:libaprutil.dll" + "Tag" = "8:" + "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C7E9135AE3874E19809A03F02CCC15C9" { "SourcePath" = "8:..\\..\\conf\\jingle_profiles\\server.noload" @@ -3132,26 +2802,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB7CBDD38519056FAA16312EEF6BCAF7" - { - "SourcePath" = "8:mod_spidermonkey.dll" - "TargetName" = "8:mod_spidermonkey.dll" - "Tag" = "8:" - "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CCAC35C9D0644917A28341E382DB6B93" { "SourcePath" = "8:..\\..\\conf\\dialplan\\default.xml" @@ -3212,26 +2862,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D7E82DD20D5B47395F635480C8E3A1D3" - { - "SourcePath" = "8:FreeSwitch.dll" - "TargetName" = "8:FreeSwitch.dll" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD54C8F25D0546E199ADB3C4B40EA20B" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\conference.conf.xml" @@ -3252,26 +2882,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E1CC91FCF87955D17FC3C0A8E875B690" - { - "SourcePath" = "8:WLDAP32.dll" - "TargetName" = "8:WLDAP32.dll" - "Tag" = "8:" - "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E5C5D9225978484CA7AD0BD78C1222EE" { "SourcePath" = "8:..\\..\\conf\\autoload_configs\\java.conf.xml" @@ -4401,11 +4011,11 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0CDD28A9559445CE96186F5FB19F690B" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_22F4FC6A582C42A0817BA85C8FEBAA18" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm" + "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm" "Properties" { } @@ -4415,11 +4025,11 @@ "Feature" = "8:" "IsolateTo" = "8:" } - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7FDBEDFAE608481684258301B02CFD1C" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DC30A9FB71F9449BAF1F5981E3538D1E" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" - "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm" + "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm" "Properties" { } @@ -4434,7 +4044,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0772289C2CC6435396616D7A2C407EA2" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_voicemail.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_voicemail.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4462,7 +4072,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_166BDBE308F54EE4881DA68F2A8189F5" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_enum.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_enum.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4490,7 +4100,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1777CB4B737E4B8481E25A10950B2B5A" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_native_file.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_native_file.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4518,7 +4128,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1CFB1AB04E024FC993E0EB4859DF8408" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dingaling.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dingaling.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4546,7 +4156,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1DCA6B2BA0F842FDB5CBA54CF52228F7" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_h26x.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_h26x.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4574,7 +4184,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2814E641538B42EFA83525986A9D5AC1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_ilbc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_ilbc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4602,7 +4212,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_28FBC5A60B44423B8A2CC378347483CE" { - "SourcePath" = "8:..\\..\\Debug\\libapr.dll" + "SourcePath" = "8:..\\..\\Release\\libapr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4630,7 +4240,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_297D0BADB993435092DDB8CDF9F2A3C6" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_cdr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_cdr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4658,7 +4268,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2B80DCCD934745B1BB4F0B31099094D9" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_say_en.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_say_en.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4686,7 +4296,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2D9E612823084E3F9E10376A7AC0C476" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g723_1.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_g723_1.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4714,7 +4324,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_2F2FEC549F02436EB87961BD1B9E5783" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_iax.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_iax.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4742,7 +4352,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_318FCC99E8D143D6B4F9F534E63009B3" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_sndfile.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_sndfile.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4770,7 +4380,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3DB5A5EF1E624F999BCEA20250508EEA" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_fifo.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_fifo.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4798,7 +4408,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3E37631016BC45B2B672FE23257D542B" { - "SourcePath" = "8:..\\..\\Debug\\pthreadVC2.dll" + "SourcePath" = "8:..\\..\\Release\\pthreadVC2.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4824,37 +4434,9 @@ { } } - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3FBEFE0119944C6781F81104ECEF37CA" - { - "SourcePath" = "8:..\\..\\Debug\\libapriconv.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - "ProjectOutputGroupRegister" = "3:1" - "OutputConfiguration" = "8:" - "OutputGroupCanonicalName" = "8:Built" - "OutputProjectGuid" = "8:{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}" - "ShowKeyOutput" = "11:TRUE" - "ExcludeFilters" - { - } - } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4A285D260C3748A4BEFA6E5A9004D128" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4882,7 +4464,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_59CFED0C4EC0492C945E4EBC04FE965F" { - "SourcePath" = "8:..\\..\\Debug\\libaprutil.dll" + "SourcePath" = "8:..\\..\\Release\\libaprutil.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -4910,7 +4492,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5EDFD5418DD243D1A03D882B83BBBCF1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_esf.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_esf.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4938,7 +4520,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6DF726E4018A4136BC27E2C6F4B67B9E" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_logfile.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_logfile.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4966,7 +4548,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_6E5C001E7A314DCEA0A4BF52BF74BCAD" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_speex.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_speex.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -4994,7 +4576,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_77550ABD8CC84D66A3B6C3C3C48665A4" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dialplan_asterisk.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dialplan_asterisk.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5022,7 +4604,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_78F060A241D0428998B42093C467AD36" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_voipcodecs.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_voipcodecs.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5050,7 +4632,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7B1050643E1E48A3B67B281B4AD43904" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_g729.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_g729.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5078,7 +4660,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8B53F026686B44189676CBC200E641C1" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_amr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_amr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5106,7 +4688,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E023477B9DC4126921A556B285B29E5" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_socket.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_socket.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5134,7 +4716,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9527B92C45BB45629BDB19ED3C8DC194" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_fsv.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_fsv.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5162,7 +4744,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_95D01083472B4853AC3F06514558F347" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_teletone.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_teletone.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5190,7 +4772,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_96F8F7DE89C74DC399E8AE55C22B4F15" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_curl.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_curl.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5218,7 +4800,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9B19C40442134D69B533E16D0851D99B" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_odbc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_odbc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5246,7 +4828,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A0D5F714A0F94250A1C39603B699AB82" { - "SourcePath" = "8:..\\..\\Debug\\libteletone.dll" + "SourcePath" = "8:..\\..\\Release\\libteletone.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5274,7 +4856,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A8D70CB0D12C4B3FB2E2E896E9A7C843" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_tone_stream.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_tone_stream.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5302,7 +4884,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A944ADCEDF884574A23F7BA5420A6BA1" { - "SourcePath" = "8:..\\..\\libs\\win32\\sqlite\\Debug\\libsqlite.lib" + "SourcePath" = "8:..\\..\\libs\\win32\\sqlite\\Release\\sqlite.lib" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5330,7 +4912,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0A2E9B4C45D4098AFD734D0C4E3EAFB" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_conference.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_conference.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5358,7 +4940,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B5542B260CD5493395871EFDE833E438" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_openmrcp.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_openmrcp.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5386,7 +4968,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BA769056DBAF4259B38F5C3FF7377055" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_curl.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_curl.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5414,7 +4996,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BB649A2C1ABE4895859025B09A240323" { - "SourcePath" = "8:..\\..\\libs\\win32\\pcre\\Debug\\libpcre.lib" + "SourcePath" = "8:..\\..\\libs\\win32\\pcre\\Release\\libpcre.lib" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5442,7 +5024,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BB99CEDF341D40F3976B6D5486D9366D" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_limit.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_limit.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5470,7 +5052,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1036825E1364537B537E542E71F9C0E" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_event_socket.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_event_socket.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5498,7 +5080,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C105055EE271471A999CE7022E617EB7" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_commands.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_commands.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5526,7 +5108,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C81AC700C1BC4A55B98DF12C0CBAFD6F" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dialplan_xml.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dialplan_xml.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5554,7 +5136,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D0BB09AFB8D94B76918F0EE85BCCAD0A" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_dptools.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_dptools.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5582,7 +5164,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D1269F1E49D442CF8EAC96C23E60325D" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_xml_rpc.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_xml_rpc.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5610,7 +5192,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D2EF447106B24E67907DAED3D39CFBB1" { - "SourcePath" = "8:..\\..\\Debug\\FreeSwitch.dll" + "SourcePath" = "8:..\\..\\Release\\FreeSwitch.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5638,7 +5220,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D6F0F5845FAD4707975CE012A33CD607" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_rss.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_rss.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5666,7 +5248,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D7EC5795A9C645AC8E129C2EE6D461ED" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_event_multicast.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_event_multicast.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5694,7 +5276,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E1AA7C5B96DA4A26859D2C7A21E00AB6" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_spidermonkey_core_db.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_spidermonkey_core_db.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5722,7 +5304,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E763C699DF0948B6984DDEB96A2DFD06" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_PortAudio.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_PortAudio.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5750,7 +5332,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EAF4B051F44745ABA9B58038FB93994C" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_expr.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_expr.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5778,7 +5360,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EC4922AEC1064C90B96EBBDD3104D761" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_local_stream.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_local_stream.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5806,7 +5388,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EF14CB99F3414BB689D0CB0E6D6B8AB8" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_console.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_console.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5834,7 +5416,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F0B800E719294692A02518CFD8CBAEFF" { - "SourcePath" = "8:..\\..\\Debug\\FreeSwitch.exe" + "SourcePath" = "8:..\\..\\Release\\FreeSwitch.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF" @@ -5862,7 +5444,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB1B9FBDC3294F1C96DAC4246C013C22" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_woomera.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_woomera.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5890,7 +5472,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBB0E565B1DE49CE9C827ACAC337AC5B" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_sofia.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_sofia.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521" @@ -5918,7 +5500,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FBD45C36E901435399634CACA5339597" { - "SourcePath" = "8:..\\..\\Debug\\mod\\mod_cdr_csv.dll" + "SourcePath" = "8:..\\..\\Release\\mod\\mod_cdr_csv.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B6E020422C78490D96F78DB0E1A3F521"