taigrr/tplinkController
1
0
Fork 0
mirror of https://github.com/taigrr/tplinkController synced 2025-01-18 04:43:13 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #1 from mikeryan/lookup_hostname"

Browse Source 
Broke builds on some systems.
This commit is contained in:
Jason Benaim 2019-07-19 12:45:46 -07:00
parent 0f1f472cf0
commit b42c1e293c
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
comms.c
View File

@ -5,7 +5,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h>
#include <unistd.h> #include <unistd.h>
#include "comms.h" #include "comms.h"
@ -107,35 +106,36 @@ char *hs100_send(char *servaddr, char *msg)
size_t s_len; size_t s_len;
int sock; int sock;
uint8_t *s, *recvbuf; uint8_t *s, *recvbuf;
struct addrinfo hints, *res; struct sockaddr_in address;
uint32_t msglen; uint32_t msglen;
size_t recvsize; size_t recvsize;
char *recvmsg = NULL; char *recvmsg;
s = hs100_encode(&s_len, msg); s = hs100_encode(&s_len, msg);
if (s == NULL) if (s == NULL)
return NULL; return NULL;
memset(&hints, 0, sizeof(hints)); sock = socket(AF_INET, SOCK_STREAM, 0);
hints.ai_family = PF_INET; if (sock < 0)
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_NUMERICSERV; // numeric port
if (getaddrinfo(servaddr, "9999", &hints, &res) != 0)
return NULL; return NULL;
sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol); memset(&address, '0', sizeof(struct sockaddr_in));
if (sock < 0)
goto out;
if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) address.sin_family = AF_INET;
goto out; address.sin_port = htons(9999);
if (inet_pton(AF_INET, servaddr, &address.sin_addr) <= 0)
return NULL;
if (connect(sock, (struct sockaddr *)&address,
sizeof(struct sockaddr_in)) < 0)
return NULL;
send(sock, s, s_len, 0); send(sock, s, s_len, 0);
free(s); free(s);
recvsize = recv(sock, &msglen, sizeof(msglen), MSG_PEEK); recvsize = recv(sock, &msglen, sizeof(msglen), MSG_PEEK);
if (recvsize != sizeof(msglen)) { if (recvsize != sizeof(msglen)) {
goto out; return NULL;
} }
msglen = ntohl(msglen) + 4; msglen = ntohl(msglen) + 4;
recvbuf = calloc(1, (size_t) msglen); recvbuf = calloc(1, (size_t) msglen);
@ -143,8 +143,5 @@ char *hs100_send(char *servaddr, char *msg)
close(sock); close(sock);
recvmsg = hs100_decode(recvbuf, msglen); recvmsg = hs100_decode(recvbuf, msglen);
free(recvbuf); free(recvbuf);
out:
freeaddrinfo(res);
return recvmsg; return recvmsg;
} }