diff --git a/README.md b/README.md index 167e4faf76..f1e1c9fd2e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ OpenNebula is an open-source project delivering a simple but feature-rich and flexible solution to build and manage enterprise clouds and virtualized data centers. -Complete documentation: https://docs.opennebula.org +Complete documentation: https://docs.opennebula.io How to contribute: https://github.com/OpenNebula/one/wiki/How-to-Contribute-to-Development @@ -44,7 +44,7 @@ include a handy script to install them and the requirements. It is located at `share/install_gems/install_gems` and you should use it to install the required gems. You have more information at: - https://docs.opennebula.org/stable/integration/references/compile.html + https://docs.opennebula.io/stable/integration/references/compile.html If you want to install them manually here are the list of required rubygems: @@ -156,20 +156,20 @@ You can find the documentation about OpenNebula architecture, installation, configuration and references to configuration files in this documentation chapter: -https://docs.opennebula.org/stable/deployment/index.html +https://docs.opennebula.io/stable/deployment/index.html The reference about the main configuration file is located here: -https://docs.opennebula.org/stable/deployment/references/oned_conf.html +https://docs.opennebula.io/stable/deployment/references/oned_conf.html ## Contact -OpenNebula web page: https://opennebula.org +OpenNebula web page: https://opennebula.io Development and issue tracking: https://github.com/OpenNebula/one/issues -Support: https://opennebula.org/support +Support: https://opennebula.io/support ## License diff --git a/share/doc/gitflow/gitflow.md b/share/doc/gitflow/gitflow.md index cf19d28ce4..b33f14d767 100644 --- a/share/doc/gitflow/gitflow.md +++ b/share/doc/gitflow/gitflow.md @@ -1,4 +1,4 @@ -Each project has it's own way of doing things. The following simple rules capture the OpenNebula dev team gitflow. Comments are welcome (contact@opennebula.org)! +Each project has it's own way of doing things. The following simple rules capture the OpenNebula dev team gitflow. Comments are welcome (contact@opennebula.io)! OpenNebula branches =================== diff --git a/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml b/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml index 4dca717285..a985c023af 100644 --- a/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml +++ b/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml @@ -8,7 +8,7 @@ opennebula_repository_version: '5.10' # Repository of the OpenNebula packages -opennebula_repository_base: 'https://downloads.opennebula.org/repo/{{ opennebula_repository_version }}' +opennebula_repository_base: 'https://downloads.opennebula.io/repo/{{ opennebula_repository_version }}' # Enable GPG check for the packages opennebula_repository_gpgcheck: yes diff --git a/share/oneprovision/ansible/roles/opennebula-repository/tasks/centos.yml b/share/oneprovision/ansible/roles/opennebula-repository/tasks/centos.yml index e9a7a45b97..022d2d2552 100644 --- a/share/oneprovision/ansible/roles/opennebula-repository/tasks/centos.yml +++ b/share/oneprovision/ansible/roles/opennebula-repository/tasks/centos.yml @@ -19,7 +19,7 @@ when: ansible_distribution == "RedHat" - name: Add repository GPG key for RPM - rpm_key: key=https://downloads.opennebula.org/repo/repo.key + rpm_key: key=https://downloads.opennebula.io/repo/repo.key when: opennebula_repository_gpgcheck | bool - name: Add OpenNebula repository @@ -27,7 +27,7 @@ name: opennebula description: OpenNebula packages baseurl: "{{ opennebula_repository_base }}/CentOS/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}" - gpgkey: https://downloads.opennebula.org/repo/repo.key + gpgkey: https://downloads.opennebula.io/repo/repo.key gpgcheck: "{{ opennebula_repository_gpgcheck }}" repo_gpgcheck: "{{ opennebula_repository_repo_gpgcheck }}" notify: "clean repository metadata" diff --git a/share/oneprovision/ansible/roles/opennebula-repository/tasks/debian.yml b/share/oneprovision/ansible/roles/opennebula-repository/tasks/debian.yml index 27175ba1e9..43ba875e65 100644 --- a/share/oneprovision/ansible/roles/opennebula-repository/tasks/debian.yml +++ b/share/oneprovision/ansible/roles/opennebula-repository/tasks/debian.yml @@ -8,7 +8,7 @@ - name: Add repository key apt_key: - url: https://downloads.opennebula.org/repo/repo.key + url: https://downloads.opennebula.io/repo/repo.key validate_certs: no state: present register: apt_result diff --git a/share/rubygems/generate b/share/rubygems/generate index 9d5752604b..2dbc476f3a 100755 --- a/share/rubygems/generate +++ b/share/rubygems/generate @@ -49,12 +49,12 @@ Gem::Specification.new do |s| s.summary = "$(SUMMARY)" s.description = "$(DESCRIPTION)" s.authors = ["OpenNebula"] - s.email = 'contact@opennebula.org' + s.email = 'contact@opennebula.io' s.license = 'Apache-2.0' s.files = [ $(FILES) ] - s.homepage = 'http://opennebula.org' + s.homepage = 'http://opennebula.io' $(EXECUTABLES) $(DEPENDENCIES) end @@ -237,4 +237,3 @@ Dir.chdir(root) GEM_DESCRIPTION.each {|name, gem| generate_gem(gem) } - diff --git a/src/flow/lib/models/service_pool.rb b/src/flow/lib/models/service_pool.rb index 9432550eff..820c13104f 100644 --- a/src/flow/lib/models/service_pool.rb +++ b/src/flow/lib/models/service_pool.rb @@ -45,7 +45,7 @@ module OpenNebula # # @param [OpenNebula::Client] client the xml-rpc client # @param [Integer] user_id the filter flag, see - # http://opennebula.org/documentation:rel3.6:api + # http://docs.opennebula.io/stable/integration/system_interfaces/api.html # # @return [DocumentPool] the new object def initialize(cloud_auth, client) diff --git a/src/market_mad/remotes/one/monitor b/src/market_mad/remotes/one/monitor index 80493dac7f..6936e12c8d 100755 --- a/src/market_mad/remotes/one/monitor +++ b/src/market_mad/remotes/one/monitor @@ -25,7 +25,7 @@ require 'rexml/document' # OpenNebula MarketPlace class OneMarket - ONE_MARKET_URL = 'https://marketplace.opennebula.systems/' + ONE_MARKET_URL = 'https://marketplace.opennebula.io/' AGENT = 'Market Driver' VERSION = File.dirname(__FILE__) + '/../../VERSION' diff --git a/src/oca/go/src/goca/schemas/shared/nic.go b/src/oca/go/src/goca/schemas/shared/nic.go index ba5e1c7d49..4b5a2b830f 100644 --- a/src/oca/go/src/goca/schemas/shared/nic.go +++ b/src/oca/go/src/goca/schemas/shared/nic.go @@ -15,7 +15,7 @@ type NIC struct { type NICKeys string // Some keys are specific to VM some others to VRouter -// For VM values: https://docs.opennebula.org/5.8/operation/references/template.html#network-section +// For VM values: https://docs.opennebula.io/5.8/operation/references/template.html#network-section const ( NICVec string = "NIC" NICID NICKeys = "NIC_ID" diff --git a/src/oca/go/src/goca/schemas/vm/keys/template.go b/src/oca/go/src/goca/schemas/vm/keys/template.go index be4097e297..2970e04566 100644 --- a/src/oca/go/src/goca/schemas/vm/keys/template.go +++ b/src/oca/go/src/goca/schemas/vm/keys/template.go @@ -15,7 +15,7 @@ /*--------------------------------------------------------------------------- */ package keys -// Available template parts and keys are listed here: https://docs.opennebula.org/5.8/operation/references/template.html +// Available template parts and keys are listed here: https://docs.opennebula.io/5.8/operation/references/template.html // Some specific part are not defined: vCenter, Public Cloud, Hypervisor, User Inputs // Template is a type used to enumerate VM generic keys diff --git a/src/oca/go/src/goca/schemas/vm/template.go b/src/oca/go/src/goca/schemas/vm/template.go index c3f23663fa..ca3aa99469 100644 --- a/src/oca/go/src/goca/schemas/vm/template.go +++ b/src/oca/go/src/goca/schemas/vm/template.go @@ -26,7 +26,7 @@ import ( "github.com/OpenNebula/one/src/oca/go/src/goca/schemas/vm/keys" ) -// Available template parts and keys are listed here: https://docs.opennebula.org/5.8/operation/references/template.html +// Available template parts and keys are listed here: https://docs.opennebula.io/5.8/operation/references/template.html // Some specific part are not defined: vCenter, Public Cloud, Hypervisor, User Inputs // Template is a structure allowing to parse VM templates. diff --git a/src/oca/java/build.sh b/src/oca/java/build.sh index 09b09c1f69..a12ec6e768 100755 --- a/src/oca/java/build.sh +++ b/src/oca/java/build.sh @@ -85,7 +85,7 @@ do_documentation() -doctitle 'OpenNebula Cloud API Specification' \ -header 'OpenNebula
Cloud API' \ -bottom 'Visit OpenNebula.org
Copyright 2002-2019 © +href="http://opennebula.io/">OpenNebula.io
Copyright 2002-2019 © OpenNebula Project, OpenNebula Systems.' } diff --git a/src/oca/java/src/org/opennebula/client/package.html b/src/oca/java/src/org/opennebula/client/package.html index bd3527ba32..ad4ed4cb97 100644 --- a/src/oca/java/src/org/opennebula/client/package.html +++ b/src/oca/java/src/org/opennebula/client/package.html @@ -23,12 +23,12 @@ The jar files you need are xmlrpc-client-*.jar, ws-commons-util-*.jar and xmlrpc

Related Documentation

-Please visit the OpenNebula site for general information, -and consult the documentation section +Please visit the OpenNebula site for general information, +and consult the documentation section to find up to date references, tutorials, and more.

-You can learn about the OpenNebula XML-RPC API here. +You can learn about the OpenNebula XML-RPC API here.

diff --git a/src/oca/python/setup.py b/src/oca/python/setup.py index 4c69d0c7b0..481725d0c7 100644 --- a/src/oca/python/setup.py +++ b/src/oca/python/setup.py @@ -47,7 +47,7 @@ setup( long_description=long_description, # The project's main homepage. - url='http://opennebula.org', + url='http://opennebula.io', # Author details author='Rafael del Valle', diff --git a/src/oca/ruby/opennebula/document_pool.rb b/src/oca/ruby/opennebula/document_pool.rb index 97b638f154..0eea984556 100644 --- a/src/oca/ruby/opennebula/document_pool.rb +++ b/src/oca/ruby/opennebula/document_pool.rb @@ -52,7 +52,7 @@ module OpenNebula # # @param [OpenNebula::Client] client the xml-rpc client # @param [Integer] user_id the filter flag, see - # http://opennebula.org/documentation:rel3.6:api + # http://docs.opennebula.io/stable/integration/system_interfaces/api.html # # @return [DocumentPool] the new object def initialize(client, user_id=-1) diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf index 9c56d331a9..7240a24e9a 100644 --- a/src/sunstone/etc/sunstone-server.conf +++ b/src/sunstone/etc/sunstone-server.conf @@ -97,14 +97,6 @@ # Two Factor Authentication Issuer Label :two_factor_auth_issuer: opennebula -################################################################################ -# Check Upgrades -################################################################################ - -# To check for the latest release. Comment this value if you don't want to check -# this. -:remote_version: http://downloads.opennebula.org/latest - ################################################################################ # UI Settings ################################################################################ @@ -164,7 +156,7 @@ # The url should not include the /appliance path since it will be automatically # included # -:marketplace_url: http://marketplace.opennebula.systems/ +:marketplace_url: http://marketplace.opennebula.io/ ################################################################################ # OneFlow @@ -203,7 +195,7 @@ # this display button and clock icon in table of vm :leases: - suspense: + suspense: time: "+1209600" color: "#000000" warning: diff --git a/src/sunstone/public/app/tabs/official-support-tab.js b/src/sunstone/public/app/tabs/official-support-tab.js index 45d124e7fa..2ed716aca9 100644 --- a/src/sunstone/public/app/tabs/official-support-tab.js +++ b/src/sunstone/public/app/tabs/official-support-tab.js @@ -36,7 +36,7 @@ define(function(require) { SupportUtils.checkLastVersionSupport(); $(".support_not_connected > button").on("click", function(e){ e.stopPropagation(); - window.open("http://opennebula.systems/opennebula-support/", "_blank"); + window.open("http://opennebula.io/support/", "_blank"); }); } }); diff --git a/src/sunstone/public/app/tabs/official-support-tab/actions.js b/src/sunstone/public/app/tabs/official-support-tab/actions.js index a86676f2e9..120cb812c1 100644 --- a/src/sunstone/public/app/tabs/official-support-tab/actions.js +++ b/src/sunstone/public/app/tabs/official-support-tab/actions.js @@ -95,7 +95,7 @@ define(function(require) { }); if (message){ - var link = $("", {href:"https://opennebula.org/software/"}).text( + var link = $("", {href:"https://opennebula.io/use/"}).text( "(new version available: " + gitVersion + ")" ); $("#latest_version").show().empty().append(link); diff --git a/src/sunstone/routes/support.rb b/src/sunstone/routes/support.rb index 5942376a45..f6b1e26906 100644 --- a/src/sunstone/routes/support.rb +++ b/src/sunstone/routes/support.rb @@ -21,7 +21,7 @@ require 'base64' UNSUPPORTED_RUBY = !(RUBY_VERSION =~ /^1.8/).nil? GITHUB_TAGS_URL = 'https://api.github.com/repos/opennebula/one/tags' -ENTERPRISE_REPO_URL = 'https://downloads.opennebula.systems/repo/' +ENTERPRISE_REPO_URL = 'https://downloads.opennebula.io/repo/' begin require 'zendesk_api' diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index e13ac12787..4e6beff88a 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -241,17 +241,17 @@ SUPPORT = { :custom_field_severity => 391197, :author_id => 21231023, :author_name => "OpenNebula Support Team", - :support_subscription => "http://opennebula.systems/support/", - :account => "http://opennebula.systems/buy/", - :docs => "http://docs.opennebula.org/5.11/", - :community => "http://opennebula.org/support/community/", + :support_subscription => "https://opennebula.io/support/", + :account => "https://opennebula.io/buy-support", + :docs => "https://docs.opennebula.io/5.11/", + :community => "https://opennebula.io/usec", :project => "OpenNebula" } UPGRADE = { :upgrade => "Upgrade Available ", :no_upgrade => "", - :url => "http://opennebula.org/software/" + :url => "https://opennebula.io/use/" } ############################################################################## @@ -637,16 +637,7 @@ end get '/version' do version = {} - if (remote_version_url = $conf[:remote_version]) - begin - version = JSON.parse(Net::HTTP.get(URI(remote_version_url))) - rescue Exception - end - end - - if !version["version"] || version["version"].empty? - version["version"] = OpenNebula::VERSION - end + version["version"] = OpenNebula::VERSION [200, version.to_json] end diff --git a/src/sunstone/views/index.erb b/src/sunstone/views/index.erb index 35ffa8455c..eae5c99a07 100644 --- a/src/sunstone/views/index.erb +++ b/src/sunstone/views/index.erb @@ -90,7 +90,7 @@
- OpenNebula <%= OpenNebula::VERSION %> + OpenNebula <%= OpenNebula::VERSION %>

by OpenNebula Systems.

diff --git a/src/sunstone/views/login.erb b/src/sunstone/views/login.erb index e35875c41c..47c4ceddcc 100644 --- a/src/sunstone/views/login.erb +++ b/src/sunstone/views/login.erb @@ -59,9 +59,9 @@ diff --git a/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c b/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c index 3a14441d40..fa69870361 100644 --- a/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c +++ b/src/vmm_mad/remotes/lib/lxd/svncterm_server/genfont.c @@ -1,23 +1,23 @@ /* - + Copyright (C) 2007 Proxmox Server Solutions GmbH - + Copyright: vzdump is under GNU GPL, the GNU General Public License. - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + Author: Dietmar Maurer Copyright 2002-2019, OpenNebula Project, OpenNebula Systems @@ -26,12 +26,12 @@ - Added command line options & usage - Other minor code changes - contact@opennebula.systems + contact@opennebula.io */ #include #include -#include +#include #include #include #include @@ -66,7 +66,7 @@ static int vt_font_maxsize = 0; //Max size of fontmap #define PSF2_SEPARATOR 0xFF #define PSF2_STARTSEQ 0xFE -struct psf2_header +struct psf2_header { unsigned char magic[4]; unsigned int version; @@ -89,7 +89,7 @@ struct psf2_header */ static int font_add_glyph (const char *data, unsigned int gsize) { - if (vt_font_size >= vt_font_maxsize) + if (vt_font_size >= vt_font_maxsize) { vt_font_maxsize += 256; vt_font_data = realloc (vt_font_data, vt_font_maxsize * gsize); @@ -158,7 +158,7 @@ static int load_psf_font (const char *filename, int is_default) gzFile f = gzopen(filename, "rb"); - if (f == NULL) + if (f == NULL) { fprintf (stderr, "unable to read file %s\n", filename); return -1; @@ -167,7 +167,7 @@ static int load_psf_font (const char *filename, int is_default) /* ---------------------------------------------------------------------- */ /* Load PSF2 header and check consistency */ /* ---------------------------------------------------------------------- */ - if (gzread(f, &psf2hdr, psf2hdr_len) != psf2hdr_len) + if (gzread(f, &psf2hdr, psf2hdr_len) != psf2hdr_len) { fprintf(stderr, "Wrong header in psf2 font file (%s)\n", filename); gzclose(f); @@ -208,7 +208,7 @@ static int load_psf_font (const char *filename, int is_default) char *chardata = (char *) malloc (font_size); - if (gzread(f, chardata, font_size)!= font_size) + if (gzread(f, chardata, font_size)!= font_size) { fprintf (stderr, "Cannot read font character data from %s\n", filename); gzclose (f); @@ -221,7 +221,7 @@ static int load_psf_font (const char *filename, int is_default) /* ---------------------------------------------------------------------- */ /* Read the Unicode description of the glyphs */ /* ---------------------------------------------------------------------- */ - for (int glyph = 0 ;glyph < psf2hdr.length ;glyph++) + for (int glyph = 0 ;glyph < psf2hdr.length ;glyph++) { int fi = 0; char s; @@ -241,9 +241,9 @@ static int load_psf_font (const char *filename, int is_default) break; } - if (!vt_fontmap[uchar] && uchar != 0) + if (!vt_fontmap[uchar] && uchar != 0) { - if (!fi) + if (!fi) { fi = font_add_glyph(chardata + glyph * gsize, gsize); } @@ -251,11 +251,11 @@ static int load_psf_font (const char *filename, int is_default) vt_fontmap[uchar] = fi; } - if (is_default && fi && glyph < 256) + if (is_default && fi && glyph < 256) { - vt_fontmap[0xf000 + glyph] = fi; + vt_fontmap[0xf000 + glyph] = fi; } - } + } } free(chardata); @@ -274,7 +274,7 @@ void print_glyphs () printf ("static unsigned char vt_font_data[] = {\n"); - for (int i = 0; i < vt_font_size; i++) + for (int i = 0; i < vt_font_size; i++) { printf("\t/* %d 0x%02x */\n", i, i); @@ -284,10 +284,10 @@ void print_glyphs () printf ("\t0x%02X, /* ", d); - for (int k = 128; k > 0; k = k>>1) + for (int k = 128; k > 0; k = k>>1) { - printf ("%c", (d & k) ? '1': '0'); - } + printf ("%c", (d & k) ? '1': '0'); + } printf (" */\n"); } @@ -299,7 +299,7 @@ void print_glyphs () printf ("static unsigned short vt_fontmap[65536] = {\n"); - for (int i = 0; i < 0x0ffff; i++) + for (int i = 0; i < 0x0ffff; i++) { printf ("\t/* 0x%04X => */ %d,\n", i, vt_fontmap[i]); } @@ -313,7 +313,7 @@ void print_glyphs () static void print_usage() { - fprintf(stderr, "Usage: genfont [-d font_path] [font1 font2...]\n"); + fprintf(stderr, "Usage: genfont [-d font_path] [font1 font2...]\n"); fprintf(stderr, "Generate Glyph Bitmaps and associated Unicode mapping\n\n"); fprintf(stderr, "\tfont1... List of fonts, the first one is the default\n\n"); fprintf(stderr, "\t-d path: Font path defaults to /usr/share/consolefonts\n\n"); @@ -370,4 +370,3 @@ int main (int argc, char** argv) exit (0); } - diff --git a/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c b/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c index 072a222b44..7cff0fe4f6 100644 --- a/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c +++ b/src/vmm_mad/remotes/lib/lxd/svncterm_server/svncterm_server.c @@ -31,7 +31,7 @@ - Simplify timeout managemnt - Adds some specific options - contact@opennebula.systems + contact@opennebula.io */ @@ -106,7 +106,7 @@ ucs2_to_utf8 (unicode c, char *out) } static void -rfb_draw_char (rfbScreenInfoPtr rfbScreen, int x, int y, unsigned short c, +rfb_draw_char (rfbScreenInfoPtr rfbScreen, int x, int y, unsigned short c, rfbPixel col) { if (c > vt_font_size) { @@ -1661,8 +1661,8 @@ new_client (rfbClientPtr client) static void rfbVncAuthSendChallenge(rfbClientPtr cl) { - - /* 4 byte header is alreay sent. Which is rfbSecTypeVncAuth + + /* 4 byte header is alreay sent. Which is rfbSecTypeVncAuth (same as rfbVncAuth). Just send the challenge. */ rfbRandomBytes(cl->authChallenge); if (rfbWriteExact(cl, (char *)cl->authChallenge, CHALLENGESIZE) < 0) { @@ -1670,7 +1670,7 @@ rfbVncAuthSendChallenge(rfbClientPtr cl) rfbCloseClient(cl); return; } - + /* Dispatch client input to rfbVncAuthProcessResponse. */ cl->state = RFB_AUTHENTICATION; } @@ -1699,8 +1699,8 @@ rfbVncAuthNone(rfbClientPtr cl) /* - * Advertise the supported security types (protocol 3.7). Here before sending - * the list of security types to the client one more security type is added + * Advertise the supported security types (protocol 3.7). Here before sending + * the list of security types to the client one more security type is added * to the list if primaryType is not set to rfbSecTypeInvalid. This security * type is the standard vnc security type which does the vnc authentication * or it will be security type for no authentication. @@ -1754,7 +1754,7 @@ vncTerm * create_vncterm (int sd, int maxx, int maxy, int *argc, char **argv) cmap->data.bytes = malloc (16*3); - for(int i=0;i<16;i++) + for(int i=0;i<16;i++) { cmap->data.bytes[i*3 + 0] = default_red[color_table[i]]; cmap->data.bytes[i*3 + 1] = default_grn[color_table[i]]; @@ -1814,7 +1814,7 @@ vncTerm * create_vncterm (int sd, int maxx, int maxy, int *argc, char **argv) vt->cells = (TextCell *)calloc(sizeof(TextCell), vt->width*vt->total_height); - for (int i = 0; i < vt->width * vt->total_height; i++) + for (int i = 0; i < vt->width * vt->total_height; i++) { vt->cells[i].ch = ' '; vt->cells[i].attrib = vt->default_attrib; @@ -1826,13 +1826,13 @@ vncTerm * create_vncterm (int sd, int maxx, int maxy, int *argc, char **argv) rfbInitServer(screen); - if (screen->authPasswdData && strcmp(((char**)screen->authPasswdData)[0],"")) + if (screen->authPasswdData && strcmp(((char**)screen->authPasswdData)[0],"")) { screen->passwordCheck = CheckPasswordByList; rfbRegisterSecurityHandler(&VncSecurityHandlerVncAuth); } - else + else { screen->authPasswdData = NULL; screen->passwordCheck = NULL; @@ -2028,7 +2028,7 @@ void cmd_ctrl_pipe(int pipe_fd, struct vncterm_command ** client_fds) int i = 0; int rb; - do + do { rb = read(pipe_fd, &c, sizeof(char)); @@ -2047,16 +2047,16 @@ void cmd_ctrl_pipe(int pipe_fd, struct vncterm_command ** client_fds) { return; } - + char * token; - + /* FIRST TOKEN: VNC PORT */ vt_cmd = (struct vncterm_command *) malloc(sizeof(struct vncterm_command)); token = strtok(cmd, " "); vt_cmd->vnc_port = atoi(token); - + /* SECOND TOKEN: PASSWD ( - if none ) */ token = strtok(NULL, " "); @@ -2108,7 +2108,7 @@ void cmd_ctrl_pipe(int pipe_fd, struct vncterm_command ** client_fds) /* -------------------------------------------------------------------------- */ -int vncterm_cmd(int sd, int timeout, int width, int heigth, +int vncterm_cmd(int sd, int timeout, int width, int heigth, struct vncterm_command * vcmd) { #ifdef DEBUG @@ -2427,5 +2427,3 @@ int main (int argc, char** argv) return 0; } - -