Bläddra i källkod

Merge pull request #1919 from open62541/hotfix/travis_sudo

Remove manual adding of coverity certificate since we do not have sudo rights
Stefan Profanter 6 år sedan
förälder
incheckning
45e4f93dae
2 ändrade filer med 12 tillägg och 13 borttagningar
  1. 1 2
      .travis.yml
  2. 11 11
      src/server/ua_services_discovery_multicast.c

+ 1 - 2
.travis.yml

@@ -1,7 +1,7 @@
 # using c for language overwrites our compilers
 language: generic
 
-sudo: false
+sudo: required
 
 env:
   global:
@@ -244,7 +244,6 @@ before_install: |
 
  # Exit travis if on coverity_scan branch and not first build
  test $TRAVIS_BRANCH != coverity_scan -o ${TRAVIS_JOB_NUMBER##*.} = 1 || exit 0
- if [ ${TRAVIS_OS_NAME} == "linux" ]; then echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-; fi
  if [ ${TRAVIS_OS_NAME} == "linux" ]; then sh ./tools/travis/travis_linux_before_install.sh; fi
  if [ ${TRAVIS_OS_NAME} == "osx" ]; then sh ./tools/travis/travis_osx_before_install.sh; fi
 

+ 11 - 11
src/server/ua_services_discovery_multicast.c

@@ -333,19 +333,19 @@ createFullServiceDomain(char *outServiceDomain, size_t maxLen,
         }
     }
 
-    /* Copy into outServiceDomain */
     size_t offset = 0;
-    memcpy(&outServiceDomain[offset], servername->data, servernameLen);
-    offset += servernameLen;
-    if(hostnameLen > 0) {
-        memcpy(&outServiceDomain[offset], "-", 1);
-        ++offset;
-        memcpy(&outServiceDomain[offset], hostname->data, hostnameLen);
-        offset += hostnameLen;
+    if (hostnameLen > 0) {
+        UA_snprintf(outServiceDomain, maxLen - 1, "%.*s-%.*s",
+                    (int) servernameLen, (char *) servername->data,
+                    (int) hostnameLen, (char *) hostname->data);
+        offset = servernameLen + hostnameLen + 1;
     }
-    memcpy(&outServiceDomain[offset], "._opcua-tcp._tcp.local.", 23);
-    offset += 23;
-    outServiceDomain[offset] = 0;
+    else {
+        UA_snprintf(outServiceDomain, maxLen - 1, "%.*s",
+                    (int) servernameLen, (char *) servername->data);
+        offset = servernameLen;
+    }
+    UA_snprintf(&outServiceDomain[offset], 24, "._opcua-tcp._tcp.local.");
 }
 
 /* Check if mDNS already has an entry for given hostname and port combination */