X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=940bc6e73f3dd91cbe269d72c11e445ff1cedd3e;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=db7a8cd631949d41e2ba4a73af9b91af2d8ecf92;hpb=511b51ffe60c20a9091829c03863197b76027716;p=tinc

diff --git a/src/utils.c b/src/utils.c
index db7a8cd6..940bc6e7 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -18,11 +18,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "logger.h"
 #include "system.h"
-#include "xalloc.h"
-
-#include "../src/logger.h"
 #include "utils.h"
+#include "xalloc.h"
 
 static const char hexadecimals[] = "0123456789ABCDEF";
 static const char base64_original[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -159,7 +158,7 @@ int b64encode_urlsafe(const void *src, char *dst, int length) {
 const char *winerror(int err) {
 	static char buf[1024], *ptr;
 
-	ptr = buf + sprintf(buf, "(%d) ", err);
+	ptr = buf + snprintf(buf, sizeof(buf), "(%d) ", err);
 
 	if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
 		NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ptr, sizeof(buf) - (ptr - buf), NULL)) {
@@ -175,8 +174,8 @@ const char *winerror(int err) {
 
 unsigned int bitfield_to_int(const void *bitfield, size_t size) {
 	unsigned int value = 0;
-	if(size > sizeof value)
-		size = sizeof value;
+	if(size > sizeof(value))
+		size = sizeof(value);
 	memcpy(&value, bitfield, size);
 	return value;
 }
@@ -192,6 +191,27 @@ bool check_id(const char *id) {
 	return true;
 }
 
+bool check_netname(const char *netname, bool strict) {
+	if(!netname || !*netname || *netname == '.')
+		return false;
+
+	for(const char *c = netname; *c; c++) {
+		if(iscntrl(*c))
+			return false;
+		if(*c == '/' || *c == '\\')
+			return false;
+		if(strict && strchr(" $%<>:`\"|?*", *c))
+			return false;
+	}
+
+	return true;
+}
+
+/* Windows doesn't define HOST_NAME_MAX. */
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 255
+#endif
+
 char *replace_name(const char *name) {
 	char *ret_name;
 
@@ -203,7 +223,7 @@ char *replace_name(const char *name) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Invalid Name: environment variable %s does not exist\n", name + 1);
 				return NULL;
 			}
-			if (gethostname(hostname, sizeof hostname) || !*hostname) {
+			if (gethostname(hostname, sizeof(hostname)) || !*hostname) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", sockstrerror(sockerrno));
 				return NULL;
 			}