GithubStar/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-10-29 11:36:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix addrinfo with unix domain socket (#337)

Browse Source 
* fix addrinfo with unix domain socket

* add a return

* update workflow package version
This commit is contained in:
xiehan
2021-04-15 01:24:41 +08:00
committed by GitHub
parent 3f273ad116
commit d4f0fa0f5b
3 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,7 @@ set(CMAKE_SKIP_RPATH TRUE)
project(
workflow
VERSION 0.9.5
VERSION 0.9.6
LANGUAGES C CXX
)
src/algorithm/DNSRoutine.cc
+38 -16
View File
@@ -16,8 +16,14 @@
Authors: Wu Jiaxu (wujiaxu@sogou-inc.com)
*/
#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <netdb.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <string>
#include "DNSRoutine.h"
#define PORT_STR_MAX 5
@@ -48,25 +54,41 @@ DNSOutput& DNSOutput::operator= (DNSOutput&& move)
return *this;
}
void DNSRoutine::run_local_path(const std::string& path, DNSOutput *out)
{
struct sockaddr_un *sun = NULL;
if (path.size() <= sizeof sun->sun_path)
{
size_t size = sizeof (struct addrinfo) + sizeof (struct sockaddr_un);
out->addrinfo_ = (struct addrinfo *)calloc(size, 1);
if (out->addrinfo_)
{
sun = (struct sockaddr_un *)(out->addrinfo_ + 1);
sun->sun_family = AF_UNIX;
memcpy(sun->sun_path, path.c_str(), path.size());
out->addrinfo_->ai_family = AF_UNIX;
out->addrinfo_->ai_socktype = SOCK_STREAM;
out->addrinfo_->ai_addr = (struct sockaddr *)sun;
size = offsetof(struct sockaddr_un, sun_path) + path.size();
out->addrinfo_->ai_addrlen = size;
out->error_ = 0;
return;
}
}
else
errno = EINVAL;
out->error_ = EAI_SYSTEM;
}
void DNSRoutine::run(const DNSInput *in, DNSOutput *out)
{
if (!in->host_.empty() && in->host_[0] == '/')
{
out->error_ = 0;
out->addrinfo_ = (addrinfo*)malloc(sizeof (struct addrinfo) + sizeof (struct sockaddr_un));
out->addrinfo_->ai_flags = AI_ADDRCONFIG;
out->addrinfo_->ai_family = AF_UNIX;
out->addrinfo_->ai_socktype = SOCK_STREAM;
out->addrinfo_->ai_protocol = 0;
out->addrinfo_->ai_addrlen = sizeof (struct sockaddr_un);
out->addrinfo_->ai_addr = (struct sockaddr *)((char *)(out->addrinfo_) + sizeof (struct addrinfo));
out->addrinfo_->ai_canonname = NULL;
out->addrinfo_->ai_next = NULL;
struct sockaddr_un *sun = (struct sockaddr_un *)(out->addrinfo_->ai_addr);
sun->sun_family = AF_UNIX;
memset(sun->sun_path, 0, sizeof (sun->sun_path));
strcpy(sun->sun_path, in->host_.c_str());
run_local_path(in->host_, out);
return;
}
src/algorithm/DNSRoutine.h
+3
View File
@@ -92,6 +92,9 @@ class DNSRoutine
{
public:
static void run(const DNSInput *in, DNSOutput *out);
private:
static void run_local_path(const std::string& path, DNSOutput *out);
};
//new WFDNSTask(queue, executor, dns_routine, callback)