Bazsalanszky/Theta
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed some minor issues

Browse source
This commit is contained in:
Balazs Toldi 2019-11-28 19:29:03 +01:00
parent 937ecf249b
commit ff823fb250
3 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/map.c
View file

@ -53,8 +53,8 @@ void map_addPair(Map *m, Pair p) {
Pair map_make_pair(char *key, char *value) {
Pair result;
strcpy(result.key, key);
strcpy(result.value, value);
strncpy(result.key, key,65);
strncpy(result.value, value,1024);
return result;
}

9
modules/config.c
View file

@ -11,15 +11,15 @@ Config config_load(){
f = fopen("config.ini", "r");
if (f != NULL) {
char buf[256], key[65], value[65];
while (fgets(buf, sizeof(buf), f) != NULL)
{
while (fgets(buf, sizeof(buf), f) != NULL) {
if (buf[0] == '#') continue;
sscanf(buf, "%[^=]=%s\n", key, value);
if (sscanf(buf, "%[^=]=%s\n", key, value) == 2) {
map_addPair(&cfg, map_make_pair(key, value));
memset(key, 0, 65);
memset(value, 0, 65);
memset(buf, 0, 256);
}
}
} else {
@ -33,7 +33,8 @@ Config config_load(){
"#Ebben a mappában vannak tárolva a html fájlok a felhasználói felülethez (Alapértelmezett: %s)\n"
"interface-folder=%s\n"
"#A felhasználói felület csak ezen a gépen érhető elő (Alapértelmezett: true;Ajánlott)\n"
"interface-local=true",DEFAULT_PORT,DEFAULT_PORT,DEFAULT_INTERFACE_PORT,DEFAULT_INTERFACE_PORT,DEFAULT_WWW_FOLDER,DEFAULT_WWW_FOLDER);
"interface-local=true", DEFAULT_PORT, DEFAULT_PORT, DEFAULT_INTERFACE_PORT, DEFAULT_INTERFACE_PORT,
DEFAULT_WWW_FOLDER, DEFAULT_WWW_FOLDER);
fclose(f);
}

8
modules/peer.c
View file

@ -9,7 +9,8 @@
int peer_ConnetctTo(char *ip, int port, PeerList *peerList, Node_data my, fd_set *fdSet) {
if (strcmp(ip, "0.0.0.0") == 0)
return 0;
if (peer_IP_isFound(*peerList, ip, port))
return 1;
struct sockaddr_in hint;
hint.sin_family = AF_INET;
hint.sin_port = htons(port);
@ -110,7 +111,7 @@ int peer_ConnetctTo(char *ip, int port, PeerList *peerList, Node_data my, fd_set
char *peers = map_getValue(m, "peers");
char *rest = peers;
if (peers != NULL) {
char *tmp = strtok(peers, ",");
char *tmp = strtok_s(peers, ",", &rest);
while (tmp != NULL) {
char ip1[NI_MAXHOST];
int port1;
@ -118,9 +119,8 @@ int peer_ConnetctTo(char *ip, int port, PeerList *peerList, Node_data my, fd_set
tmp = strtok_s(NULL, ",", &rest);
continue;
}
if (!peer_IP_isFound(*peerList, ip, port))
peer_ConnetctTo(ip1, port1, peerList, my, fdSet);
peer_ConnetctTo(ip1, port1, peerList, my, fdSet);
tmp = strtok_s(NULL, ",", &rest);
}
}