fs_cli works on windows

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

diff --git a/Freeswitch.2008.sln b/Freeswitch.2008.sln
index 5acc6fffe01061f491f3cf678ddb42b5c9efa7b8..b2d9f72fa7a1054d97fd09b5c2c172ce59d0417a 100644 (file)
--- a/Freeswitch.2008.sln
+++ b/Freeswitch.2008.sln
@@ -1724,6 +1724,7 @@ Global
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|Win32.Build.0 = Debug|Any CPU\r
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64.ActiveCfg = Debug|Any CPU\r
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.ActiveCfg = Release|Any CPU\r
+               {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.Build.0 = Release|Any CPU\r
                {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.ActiveCfg = Release|Any CPU\r
                {E796E337-DE78-4303-8614-9A590862EE95}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E796E337-DE78-4303-8614-9A590862EE95}.Debug|Win32.Build.0 = Debug|Win32\r
@@ -1768,8 +1769,10 @@ Global
                {CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|Win32.Build.0 = Release|Win32\r
                {CF405366-9558-4AE8-90EF-5E21B51CCB4E}.Release|x64.ActiveCfg = Release|Win32\r
                {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|Win32.Build.0 = Debug|Win32\r
                {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Debug|x64.ActiveCfg = Debug|Win32\r
                {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|Win32.Build.0 = Release|Win32\r
                {D2FB8043-D208-4AEE-8F18-3B5857C871B9}.Release|x64.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r

diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c
index 077d148e42938f65961e609b7a01db6f830a7a31..d196290c549ecf68002735ab24be1fed520c3b0c 100644 (file)
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@ -207,9 +207,9 @@ int main(int argc, char *argv[])
        char cfile[512] = "/tmp/fs_cli_config";
        char *home = getenv("HOME");
 #else
-       char hfile[512] = "c:\\fs_cli_history";
-       char cfile[512] = "c:\\fs_cli_config";
-       char *home = getenv("HOME");
+       char hfile[512] = ".\\fs_cli_history";
+       char cfile[512] = ".\\fs_cli_config";
+       char *home = ""; //getenv("HOME");
 #endif
        
        strncpy(profiles[0].host, "127.0.0.1", sizeof(profiles[0].host));

diff --git a/libs/esl/src/esl.c b/libs/esl/src/esl.c
index c832d11e51f5d6aaa5da42653bb645fc3aac1861..48d839c7a2fa2464cb18e7a6a41dffb85e3c3ce2 100644 (file)
--- a/libs/esl/src/esl.c
+++ b/libs/esl/src/esl.c
@@ -482,6 +482,16 @@ ESL_DECLARE(esl_status_t) esl_connect(esl_handle_t *handle, const char *host, es
        char sendbuf[256];
        int rval = 0;
        const char *hval;
+#ifdef WIN32
+       WORD wVersionRequested = MAKEWORD(2, 0);
+       WSADATA wsaData;
+       int err = WSAStartup(wVersionRequested, &wsaData);
+       if (err != 0) {
+               snprintf(handle->err, sizeof(handle->err), "WSAStartup Error");
+               return ESL_FAIL;
+       }
+
+#endif
 
        if (!handle->mutex) {
                esl_mutex_create(&handle->mutex);