summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Plugins/sip_cli/resource.rc4
-rw-r--r--Plugins/sip_cli/sdk/m_sip.h9
-rw-r--r--Plugins/sip_cli/sip_cli.cpp10
-rw-r--r--Plugins/sip_cli/sip_cli.dsp8
4 files changed, 21 insertions, 10 deletions
diff --git a/Plugins/sip_cli/resource.rc b/Plugins/sip_cli/resource.rc
index ab0c0b3..d8950b8 100644
--- a/Plugins/sip_cli/resource.rc
+++ b/Plugins/sip_cli/resource.rc
@@ -31,8 +31,8 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
CAPTION "SIP"
FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "Host: %s\nUDP: %d\nTCP: %d\nTLS: %d",IDC_DATA,7,7,199,
- 35
+ LTEXT "UDP: %s : %d\nTCP: %s : %d\nTLS: %s : %d",IDC_DATA,7,
+ 7,199,35
GROUPBOX "Contact",IDC_STATIC,7,45,199,87
LTEXT "Host:",IDC_STATIC,13,60,45,11
EDITTEXT IDC_HOST,63,58,137,13,ES_AUTOHSCROLL
diff --git a/Plugins/sip_cli/sdk/m_sip.h b/Plugins/sip_cli/sdk/m_sip.h
index 360912b..e31f813 100644
--- a/Plugins/sip_cli/sdk/m_sip.h
+++ b/Plugins/sip_cli/sdk/m_sip.h
@@ -35,6 +35,11 @@ struct SIP_REGISTRATION
int tcp_port; // UDP port to be used: 0 means TCP, -1 means don't want TCP
int tls_port; // UDP port to be used: 0 means TLS, -1 means don't want TLS
+ struct {
+ const TCHAR *host;
+ int port;
+ } stun;
+
HANDLE hNetlib; // To be used for logs. Can be 0
SIPClientCallback callback;
@@ -45,9 +50,11 @@ struct SIP_REGISTRATION
struct SIP_CLIENT
{
void *data; // Do not touch
- const TCHAR *host;
+ const TCHAR *udp_host;
const int udp_port;
+ const TCHAR *tcp_host;
const int tcp_port;
+ const TCHAR *tls_host;
const int tls_port;
// @param protocol 1 UDP, 2 TCP, 3 TLS
diff --git a/Plugins/sip_cli/sip_cli.cpp b/Plugins/sip_cli/sip_cli.cpp
index b017daf..a2fd00f 100644
--- a/Plugins/sip_cli/sip_cli.cpp
+++ b/Plugins/sip_cli/sip_cli.cpp
@@ -30,7 +30,7 @@ PLUGININFOEX pluginInfo = {
#else
"SIP Client Test (Ansi)",
#endif
- PLUGIN_MAKE_VERSION(0,1,0,0),
+ PLUGIN_MAKE_VERSION(0,1,1,0),
"SIP Client example",
"Ricardo Pescuma Domenecci",
"pescuma@miranda-im.org",
@@ -190,6 +190,8 @@ static INT_PTR ModulesLoaded(WPARAM wParam, LPARAM lParam)
SIP_REGISTRATION reg = {0};
reg.cbSize = sizeof(SIP_REGISTRATION);
reg.name = MODULE_NAME;
+ reg.stun.host = _T("stun01.sipphone.com");
+ reg.stun.port = 3478;
reg.callback = Callback;
cli = (SIP_CLIENT *) CallService(MS_SIP_REGISTER, (WPARAM) &reg, 0);
@@ -247,8 +249,10 @@ static BOOL CALLBACK TestDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
TranslateDialogDefault(hwndDlg);
TCHAR text[1024];
- mir_sntprintf(text, MAX_REGS(text), TranslateT("Host: %s\nUDP: %d\nTCP: %d\nTLS: %d"),
- cli->host, cli->udp_port, cli->tcp_port, cli->tls_port);
+ mir_sntprintf(text, MAX_REGS(text), TranslateT("UDP: %s : %d\nTCP: %s : %d\nTLS: %s : %d"),
+ cli->udp_host, cli->udp_port,
+ cli->tcp_host, cli->tcp_port,
+ cli->tls_host, cli->tls_port);
SendDlgItemMessage(hwndDlg, IDC_DATA, WM_SETTEXT, 0, (LPARAM) text);
SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_ADDSTRING, 0, (LPARAM) _T("UDP"));
diff --git a/Plugins/sip_cli/sip_cli.dsp b/Plugins/sip_cli/sip_cli.dsp
index 96eb22d..7b95e68 100644
--- a/Plugins/sip_cli/sip_cli.dsp
+++ b/Plugins/sip_cli/sip_cli.dsp
@@ -57,7 +57,7 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 user32.lib shell32.lib wininet.lib gdi32.lib /nologo /base:"0x67100000" /dll /machine:I386 /filealign:0x200
# SUBTRACT BASE LINK32 /pdb:none /map
-# ADD LINK32 kernel32.lib user32.lib /nologo /base:"" /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release\Plugins\sip_cli.dll" /pdbtype:sept /filealign:0x200 /ALIGN:4096 /ignore:4108
+# ADD LINK32 kernel32.lib user32.lib /nologo /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release\Plugins\sip_cli.dll" /pdbtype:sept /filealign:0x200 /ALIGN:4096 /ignore:4108
# SUBTRACT LINK32 /profile /pdb:none
!ELSEIF "$(CFG)" == "sip_cli - Win32 Debug"
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..bin\release\Plugins\sip_cli.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108
# SUBTRACT BASE LINK32 /profile /pdb:none
-# ADD LINK32 kernel32.lib user32.lib /nologo /base:"" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug\Plugins\sip_cli.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108
+# ADD LINK32 kernel32.lib user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug\Plugins\sip_cli.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108
# SUBTRACT LINK32 /profile /pdb:none
!ELSEIF "$(CFG)" == "sip_cli - Win32 Unicode Debug"
@@ -115,7 +115,7 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x32100000" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug\Plugins\sip_cli.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108
# SUBTRACT BASE LINK32 /profile /pdb:none
-# ADD LINK32 kernel32.lib user32.lib /nologo /base:"" /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug unicode\Plugins\sip_cliW.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108
+# ADD LINK32 kernel32.lib user32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\bin\debug unicode\Plugins\sip_cliW.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108
# SUBTRACT LINK32 /profile /pdb:none
!ELSEIF "$(CFG)" == "sip_cli - Win32 Unicode Release"
@@ -144,7 +144,7 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x32100000" /dll /map /machine:I386 /out:"..\..\bin\release\Plugins\sip_cli.dll" /filealign:0x200 /ALIGN:4096 /ignore:4108
# SUBTRACT BASE LINK32 /profile /pdb:none
-# ADD LINK32 kernel32.lib user32.lib /nologo /base:"" /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release\Plugins\sip_cliW.dll" /pdbtype:sept /filealign:0x200 /ALIGN:4096 /ignore:4108
+# ADD LINK32 kernel32.lib user32.lib /nologo /dll /map /debug /debugtype:both /machine:I386 /out:"..\..\bin\release\Plugins\sip_cliW.dll" /pdbtype:sept /filealign:0x200 /ALIGN:4096 /ignore:4108
# SUBTRACT LINK32 /profile /pdb:none
!ENDIF
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 11:32:46 +0000