matt/ttynvt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

socket: Move host:port parsing to socket function

Browse Source
This commit is contained in:
Kim Woelders
2023-02-12 22:12:59 +01:00
parent a49f95a300
commit a978e86c82
3 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nvt_socket.c
+16 -12
View File
@@ -2,6 +2,8 @@
* Socket interface API
*/
#include <netdb.h> /* getaddrinfo() */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/socket.h>
@@ -10,12 +12,22 @@
#include "nvt_socket.h"
int socket_create_client(const char *host, unsigned int port)
int socket_create_client(const char *addr)
{
struct sockaddr_in serveraddr;
char host[64], port[64];
struct hostent *server;
struct sockaddr_in serveraddr;
int sockfd, err;
sscanf(addr, "%63[^:]:%63s", host, port);
server = gethostbyname(host);
if (server == NULL)
{
nvt_log(LOG_ERR, "Cannot resolve host name: %m\n");
return -1;
}
sockfd = socket(AF_INET, SOCK_STREAM, 0);
if (sockfd < 0)
{
@@ -23,24 +35,16 @@ int socket_create_client(const char *host, unsigned int port)
return sockfd;
}
server = gethostbyname(host);
if (server == NULL)
{
nvt_log(LOG_ERR, "Cannot resolve host name: %m\n");
close(sockfd);
return -1;
}
bzero((char *)&serveraddr, sizeof(serveraddr));
serveraddr.sin_family = AF_INET;
bcopy((char *)server->h_addr, (char *)&serveraddr.sin_addr.s_addr,
server->h_length);
serveraddr.sin_port = htons(port);
serveraddr.sin_port = htons(atoi(port));
err = connect(sockfd, (struct sockaddr *)&serveraddr, sizeof(serveraddr));
if (err < 0)
{
nvt_log(LOG_ERR, "Failed to connect to: %s:%u: %m\n", host, port);
nvt_log(LOG_ERR, "Failed to connect to: %s: %m\n", addr);
close(sockfd);
return -1;
}