[Spice-devel] [spice-xpi PATCHv2 03/12] Rename controller.cpp to controller-unix.cpp
Christophe Fergeau
cfergeau at redhat.com
Wed Mar 13 03:15:37 PDT 2013
It mostly contain low-level controller/plugin communication code,
and this is mainly non-portable code, let's rename this file to
make this explicit. We will then add a controller.cpp file
containing the generic code, and a controller-win.cpp file
with the Windows specific code.
---
SpiceXPI/src/plugin/Makefile.am | 2 +-
SpiceXPI/src/plugin/controller-unix.cpp | 192 +++++++++++++++++++++++++++++++
SpiceXPI/src/plugin/controller.cpp | 194 --------------------------------
3 files changed, 193 insertions(+), 195 deletions(-)
create mode 100644 SpiceXPI/src/plugin/controller-unix.cpp
delete mode 100644 SpiceXPI/src/plugin/controller.cpp
diff --git a/SpiceXPI/src/plugin/Makefile.am b/SpiceXPI/src/plugin/Makefile.am
index d5434e5..2f12e70 100644
--- a/SpiceXPI/src/plugin/Makefile.am
+++ b/SpiceXPI/src/plugin/Makefile.am
@@ -26,8 +26,8 @@ libnsISpicec_la_SOURCES = \
$(top_srcdir)/common/rederrorcodes.h \
glib-compat.c \
glib-compat.h \
- controller.cpp \
controller.h \
+ controller-unix.cpp \
npapi/npapi.h \
npapi/npfunctions.h \
npapi/npruntime.h \
diff --git a/SpiceXPI/src/plugin/controller-unix.cpp b/SpiceXPI/src/plugin/controller-unix.cpp
new file mode 100644
index 0000000..b912c27
--- /dev/null
+++ b/SpiceXPI/src/plugin/controller-unix.cpp
@@ -0,0 +1,192 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Copyright 2009-2011, Red Hat Inc.
+ * Based on mozilla.org's scriptable plugin example
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Uri Lublin
+ * Martin Stransky
+ * Peter Hatina
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+#include <glib.h>
+
+extern "C" {
+# include <stdint.h>
+# include <unistd.h>
+# include <fcntl.h>
+# include <sys/socket.h>
+# include <sys/un.h>
+}
+
+#include "rederrorcodes.h"
+#include "controller.h"
+
+SpiceController::SpiceController():
+ m_client_socket(-1)
+{
+}
+
+SpiceController::SpiceController(const std::string &name):
+ m_client_socket(-1),
+ m_name(name)
+{
+}
+
+SpiceController::~SpiceController()
+{
+ g_debug(G_STRFUNC);
+ Disconnect();
+}
+
+void SpiceController::SetFilename(const std::string &name)
+{
+ m_name = name;
+}
+
+int SpiceController::Connect()
+{
+ // check, if we have a filename for socket to create
+ if (m_name.empty())
+ return -1;
+
+ if (m_client_socket == -1)
+ {
+ if ((m_client_socket = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+ {
+ g_critical("controller socket: %s", g_strerror(errno));
+ return -1;
+ }
+ }
+
+ struct sockaddr_un remote;
+ remote.sun_family = AF_UNIX;
+ if (m_name.length() + 1 > sizeof(remote.sun_path))
+ return -1;
+ strcpy(remote.sun_path, m_name.c_str());
+
+ int rc = connect(m_client_socket, (struct sockaddr *) &remote, strlen(remote.sun_path) + sizeof(remote.sun_family));
+ if (rc == -1)
+ {
+ g_critical("controller connect: %s", g_strerror(errno));
+ }
+ else
+ {
+ g_debug("controller connected");
+ }
+
+ return rc;
+}
+
+int SpiceController::Connect(const int nRetries)
+{
+ int rc = -1;
+ int sleep_time = 0;
+
+ // try to connect for specified count
+ for (int i = 0; rc != 0 && i < nRetries; ++i)
+ {
+ rc = Connect();
+ sleep(sleep_time);
+ ++sleep_time;
+ }
+
+ return rc;
+}
+
+void SpiceController::Disconnect()
+{
+ // close the socket
+ close(m_client_socket);
+ m_client_socket = -1;
+
+ // delete the temporary file, which is used for the socket
+ unlink(m_name.c_str());
+ m_name.clear();
+}
+
+uint32_t SpiceController::Write(const void *lpBuffer, uint32_t nBytesToWrite)
+{
+ ssize_t len = send(m_client_socket, lpBuffer, nBytesToWrite, 0);
+
+ if (len != (ssize_t)nBytesToWrite)
+ {
+ g_warning("incomplete send, bytes to write = %u, bytes written = %zd: %s",
+ nBytesToWrite, len, g_strerror(errno));
+ }
+
+ return len;
+}
+
+int SpiceController::TranslateRC(int nRC)
+{
+ switch (nRC)
+ {
+ case SPICEC_ERROR_CODE_SUCCESS:
+ return 0;
+
+ case SPICEC_ERROR_CODE_GETHOSTBYNAME_FAILED:
+ return RDP_ERROR_CODE_HOST_NOT_FOUND;
+
+ case SPICEC_ERROR_CODE_CONNECT_FAILED:
+ return RDP_ERROR_CODE_WINSOCK_CONNECT_FAILED;
+
+ case SPICEC_ERROR_CODE_ERROR:
+ case SPICEC_ERROR_CODE_SOCKET_FAILED:
+ return RDP_ERROR_CODE_INTERNAL_ERROR;
+
+ case SPICEC_ERROR_CODE_RECV_FAILED:
+ return RDP_ERROR_RECV_WINSOCK_FAILED;
+
+ case SPICEC_ERROR_CODE_SEND_FAILED:
+ return RDP_ERROR_SEND_WINSOCK_FAILED;
+
+ case SPICEC_ERROR_CODE_NOT_ENOUGH_MEMORY:
+ return RDP_ERROR_CODE_OUT_OF_MEMORY;
+
+ case SPICEC_ERROR_CODE_AGENT_TIMEOUT:
+ return RDP_ERROR_CODE_TIMEOUT;
+
+ case SPICEC_ERROR_CODE_AGENT_ERROR:
+ return RDP_ERROR_CODE_INTERNAL_ERROR;
+
+ default:
+ return RDP_ERROR_CODE_INTERNAL_ERROR;
+ }
+}
+
diff --git a/SpiceXPI/src/plugin/controller.cpp b/SpiceXPI/src/plugin/controller.cpp
deleted file mode 100644
index 99e58b3..0000000
--- a/SpiceXPI/src/plugin/controller.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Copyright 2009-2011, Red Hat Inc.
- * Based on mozilla.org's scriptable plugin example
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Uri Lublin
- * Martin Stransky
- * Peter Hatina
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "config.h"
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <cerrno>
-#include <glib.h>
-
-extern "C" {
-# include <stdint.h>
-# include <unistd.h>
-# include <fcntl.h>
-# include <sys/socket.h>
-# include <sys/un.h>
-}
-
-#include "rederrorcodes.h"
-#include "controller.h"
-
-SpiceController::SpiceController():
- m_client_socket(-1)
-{
-}
-
-SpiceController::SpiceController(const std::string &name):
- m_client_socket(-1),
- m_name(name)
-{
-}
-
-SpiceController::~SpiceController()
-{
- g_debug(G_STRFUNC);
- Disconnect();
-}
-
-void SpiceController::SetFilename(const std::string &name)
-{
- m_name = name;
-}
-
-int SpiceController::Connect()
-{
- // check, if we have a filename for socket to create
- if (m_name.empty())
- return -1;
-
- if (m_client_socket == -1)
- {
- if ((m_client_socket = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
- {
- g_critical("controller socket: %s", g_strerror(errno));
- return -1;
- }
- }
-
- struct sockaddr_un remote;
- remote.sun_family = AF_UNIX;
- if (m_name.length() + 1 > sizeof(remote.sun_path))
- return -1;
- strcpy(remote.sun_path, m_name.c_str());
-
- int rc = connect(m_client_socket, (struct sockaddr *) &remote, strlen(remote.sun_path) + sizeof(remote.sun_family));
- if (rc == -1)
- {
- g_critical("controller connect: %s", g_strerror(errno));
- }
- else
- {
- g_debug("controller connected");
- }
-
- return rc;
-}
-
-int SpiceController::Connect(const int nRetries)
-{
- int rc = -1;
- int sleep_time = 0;
-
- // try to connect for specified count
- for (int i = 0; rc != 0 && i < nRetries; ++i)
- {
- rc = Connect();
- sleep(sleep_time);
- ++sleep_time;
- }
-
- return rc;
-}
-
-void SpiceController::Disconnect()
-{
- // close the socket
- close(m_client_socket);
- m_client_socket = -1;
-
- // delete the temporary file, which is used for the socket
- unlink(m_name.c_str());
- m_name.clear();
-}
-
-uint32_t SpiceController::Write(const void *lpBuffer, uint32_t nBytesToWrite)
-{
- ssize_t len = send(m_client_socket, lpBuffer, nBytesToWrite, 0);
-
- if (len != (ssize_t)nBytesToWrite)
- {
- g_warning("incomplete send, bytes to write = %u, bytes written = %zd: %s",
- nBytesToWrite, len, g_strerror(errno));
- }
-
- return len;
-}
-
-int SpiceController::TranslateRC(int nRC)
-{
- switch (nRC)
- {
- case SPICEC_ERROR_CODE_SUCCESS:
- return 0;
-
- case SPICEC_ERROR_CODE_GETHOSTBYNAME_FAILED:
- return RDP_ERROR_CODE_HOST_NOT_FOUND;
-
- case SPICEC_ERROR_CODE_CONNECT_FAILED:
- return RDP_ERROR_CODE_WINSOCK_CONNECT_FAILED;
-
- case SPICEC_ERROR_CODE_ERROR:
- case SPICEC_ERROR_CODE_SOCKET_FAILED:
- return RDP_ERROR_CODE_INTERNAL_ERROR;
-
- case SPICEC_ERROR_CODE_RECV_FAILED:
- return RDP_ERROR_RECV_WINSOCK_FAILED;
-
- case SPICEC_ERROR_CODE_SEND_FAILED:
- return RDP_ERROR_SEND_WINSOCK_FAILED;
-
- case SPICEC_ERROR_CODE_NOT_ENOUGH_MEMORY:
- return RDP_ERROR_CODE_OUT_OF_MEMORY;
-
- case SPICEC_ERROR_CODE_AGENT_TIMEOUT:
- return RDP_ERROR_CODE_TIMEOUT;
-
- case SPICEC_ERROR_CODE_AGENT_ERROR:
- return RDP_ERROR_CODE_INTERNAL_ERROR;
-
- default:
- return RDP_ERROR_CODE_INTERNAL_ERROR;
- }
-}
-
--
1.8.1.4
More information about the Spice-devel
mailing list