X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fstun.cpp;h=62e302fffe299e8f20b1acf3114350669e23014b;hb=afc2bcf340f842111978138a9e04e0b14e5de9fe;hp=c5863f0885a4b1a1006478f846b28e51a3c744b9;hpb=6e9bdffe9ddcda32a6c0431cacdd27d5daf33ce3;p=novacoin.git

diff --git a/src/stun.cpp b/src/stun.cpp
index c5863f0..62e302f 100644
--- a/src/stun.cpp
+++ b/src/stun.cpp
@@ -29,6 +29,8 @@
  */
 
 #include <stdio.h>
+#include <inttypes.h>
+#include <limits>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -40,13 +42,17 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #endif
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <time.h>
 #include <errno.h>
 
-
 #include "ministun.h"
 
+extern int GetRandInt(int nMax);
+extern uint64_t GetRand(uint64_t nMax);
+
 /*---------------------------------------------------------------------*/
 
 struct StunSrv {
@@ -332,15 +338,20 @@ static int stun_send(int s, struct sockaddr_in *dst, struct stun_header *resp)
 }
 
 /* helper function to generate a random request id */
-static uint64_t randfiller;
+static uint64_t randfiller = GetRand(std::numeric_limits<uint64_t>::max());
 static void stun_req_id(struct stun_header *req)
 {
     const uint64_t *S_block = (const uint64_t *)StunSrvList;
+    req->id.id[0] = GetRandInt(std::numeric_limits<int32_t>::max());
+    req->id.id[1] = GetRandInt(std::numeric_limits<int32_t>::max());
+    req->id.id[2] = GetRandInt(std::numeric_limits<int32_t>::max());
+    req->id.id[3] = GetRandInt(std::numeric_limits<int32_t>::max());
+
     req->id.id[0] |= 0x55555555;
     req->id.id[1] &= 0x55555555;
     req->id.id[2] |= 0x55555555;
     req->id.id[3] &= 0x55555555;
-    register char x = 20;
+    char x = 20;
     do {
         uint32_t s_elm = S_block[(uint8_t)randfiller];
         randfiller ^= (randfiller << 5) | (randfiller >> (64 - 5));
@@ -445,7 +456,7 @@ static int StunRequest2(int sock, struct sockaddr_in *server, struct sockaddr_in
 
     req = (struct stun_header *)reqdata;
     stun_req_id(req);
-    int reqlen = 0;
+    unsigned short reqlen = 0;
     req->msgtype = 0;
     req->msglen = 0;
     req->msglen = htons(reqlen);
@@ -505,8 +516,11 @@ static int StunRequest(const char *host, uint16_t port, struct sockaddr_in *mapp
     int rc = -3;
     if(bind(sock, (struct sockaddr*)&client, sizeof(client)) >= 0)
         rc = StunRequest2(sock, &server, mapped);
-
+#ifndef WIN32
     close(sock);
+#else
+    closesocket(sock);
+#endif
     return rc;
 } // StunRequest