mirror of
				https://github.com/taigrr/tplinkController
				synced 2025-01-18 04:43:13 -08:00 
			
		
		
		
	Merge pull request #1 from mikeryan/lookup_hostname
resolve hostname using getaddrinfo
This commit is contained in:
		
						commit
						fbe8da7a4b
					
				
							
								
								
									
										35
									
								
								comms.c
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								comms.c
									
									
									
									
									
								
							| @ -5,6 +5,7 @@ | |||||||
| #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" | ||||||
| 
 | 
 | ||||||
| @ -106,36 +107,35 @@ 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 sockaddr_in address; | 	struct addrinfo hints, *res; | ||||||
| 	uint32_t msglen; | 	uint32_t msglen; | ||||||
| 	size_t recvsize; | 	size_t recvsize; | ||||||
| 	char *recvmsg; | 	char *recvmsg = NULL; | ||||||
| 
 | 
 | ||||||
| 	s = hs100_encode(&s_len, msg); | 	s = hs100_encode(&s_len, msg); | ||||||
| 	if (s == NULL) | 	if (s == NULL) | ||||||
| 		return NULL; | 		return NULL; | ||||||
| 
 | 
 | ||||||
| 	sock = socket(AF_INET, SOCK_STREAM, 0); | 	memset(&hints, 0, sizeof(hints)); | ||||||
|  | 	hints.ai_family = PF_INET; | ||||||
|  | 	hints.ai_socktype = SOCK_STREAM; | ||||||
|  | 	hints.ai_flags = AI_NUMERICSERV; // numeric port
 | ||||||
|  | 
 | ||||||
|  | 	if (getaddrinfo(servaddr, "9999", &hints, &res) != 0) | ||||||
|  | 		return NULL; | ||||||
|  | 
 | ||||||
|  | 	sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol); | ||||||
| 	if (sock < 0) | 	if (sock < 0) | ||||||
| 		return NULL; | 		goto out; | ||||||
| 
 | 
 | ||||||
| 	memset(&address, '0', sizeof(struct sockaddr_in)); | 	if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) | ||||||
| 
 | 		goto out; | ||||||
| 	address.sin_family = AF_INET; |  | ||||||
| 	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)) { | ||||||
| 		return NULL; | 		goto out; | ||||||
| 	} | 	} | ||||||
| 	msglen = ntohl(msglen) + 4; | 	msglen = ntohl(msglen) + 4; | ||||||
| 	recvbuf = calloc(1, (size_t) msglen); | 	recvbuf = calloc(1, (size_t) msglen); | ||||||
| @ -143,5 +143,8 @@ 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; | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user