Attachment 578611 Details for Bug 790416 – SetSSLChannels: remove leading 's' from all spice channel names

[patch] SetSSLChannels: remove leading 's' from all spice channel names

spice-xpi-16-SetSSLChannels-remove-leading-s.patch (text/plain), 1.58 KB, created by Uri Lublin on 2012-04-19 11:23:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Lublin

Created: 2012-04-19 11:23:42 UTC

Size: 1.58 KB

patch

obsolete

>From 4540b3a67fcd6dc96c77354b70cd6510fd22f5b0 Mon Sep 17 00:00:00 2001
>From: Uri Lublin <uril@redhat.com>
>Date: Sun, 8 Apr 2012 16:56:01 +0300
>Subject: [PATCH] SetSSLChannels: remove leading 's' from all spice channel names
>
>---
>--- a/SpiceXPI/src/plugin/plugin.cpp	2012-04-19 14:06:25.213462613 +0300
>+++ b/SpiceXPI/src/plugin/plugin.cpp	2012-04-19 14:13:03.048450833 +0300
>@@ -360,18 +360,25 @@
>     LOG_DEBUG(m_ssl_channels);
> 
>     /*
>-     * HACK -- remove leading s from m_SSLChannels, e.g. "main" not "smain"
>+     * Backward Compatibility: Begin
>+     * Remove leading 's' from m_SSLChannels, e.g. "main" not "smain"
>      * RHEL5 uses 'smain' and 'sinpusts
>      * RHEL6 uses 'main'  and 'inputs'
>      */
>-    std::size_t found = 0;
>-    while ((found = m_ssl_channels.find("smain", found)) != std::string::npos)
>-      m_ssl_channels.replace(found, 5, "main");
>-
>-    found = 0;
>-    while ((found = m_ssl_channels.find("sinputs", found)) != std::string::npos)
>-      m_ssl_channels.replace(found, 7, "inputs");
>-    /* HACK */
>+    size_t found;
>+    const char* chan_names[] = {"smain" , "sdisplay", "sinputs" , "scursor",
>+                                "splayback", "srecord"};
>+    const int nnames = sizeof(chan_names) / sizeof(chan_names[0]);
>+    int i;
>+
>+    for (i=0; i < nnames; i++) {
>+        const char *name = chan_names[i];
>+        found = 0;
>+        while ((found = m_ssl_channels.find(name, found)) != std::string::npos) {
>+            m_ssl_channels.replace(found, strlen(name), name+1);
>+        }
>+    }
>+    /* Backward Compatibility: End */
> }
> 
> //* attribute string TrustStore; */

Actions: View | Diff

Attachments on bug 790416: 578610 | 578611