pdxx
/
libserverframe
mirror of https://github.com/happyfish100/libserverframe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove sf_load_server_info and sf_parse_server_info to libfastcommon

connection_manager
yuqing 2018-08-14 17:49:23 +08:00
parent b622ed6b63
commit 811ee077f1
2 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/sf_func.c
View File

@ -7,10 +7,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <grp.h>
#include <pwd.h>
#include "fastcommon/shared_func.h" #include "fastcommon/shared_func.h"
#include "fastcommon/logger.h" #include "fastcommon/logger.h"
#include "fastcommon/sockopt.h" #include "fastcommon/sockopt.h"
@ -19,76 +16,6 @@
#include "sf_global.h" #include "sf_global.h"
#include "sf_func.h" #include "sf_func.h"
int sf_parse_server_info(const char *pServerStr, ConnectionInfo *pServerInfo,
const int default_port)
{
char *parts[2];
char server_info[256];
int len;
int count;
len = strlen(pServerStr);
if (len == 0) {
logError("file: "__FILE__", line: %d, "
"pServerStr \"%s\" is empty!",
__LINE__, pServerStr);
return EINVAL;
}
if (len >= sizeof(server_info)) {
logError("file: "__FILE__", line: %d, "
"pServerStr \"%s\" is too long!",
__LINE__, pServerStr);
return ENAMETOOLONG;
}
memcpy(server_info, pServerStr, len);
*(server_info + len) = '\0';
count = splitEx(server_info, ':', parts, 2);
if (count == 1) {
pServerInfo->port = default_port;
}
else {
char *endptr = NULL;
pServerInfo->port = (int)strtol(parts[1], &endptr, 10);
if ((endptr != NULL && *endptr != '\0') || pServerInfo->port <= 0) {
logError("file: "__FILE__", line: %d, "
"pServerStr: %s, invalid port: %s!",
__LINE__, pServerStr, parts[1]);
return EINVAL;
}
}
if (getIpaddrByName(parts[0], pServerInfo->ip_addr,
sizeof(pServerInfo->ip_addr)) == INADDR_NONE)
{
logError("file: "__FILE__", line: %d, "
"pServerStr: %s, invalid hostname: %s!",
__LINE__, pServerStr, parts[0]);
return EINVAL;
}
pServerInfo->socket_domain = AF_INET;
return 0;
}
int sf_load_server_info(IniContext *pIniContext, const char *filename,
const char *item_name, ConnectionInfo *pServerInfo,
const int default_port)
{
char *pServerStr;
pServerStr = iniGetStrValue(NULL, item_name, pIniContext);
if (pServerStr == NULL) {
logError("file: "__FILE__", line: %d, "
"config file: %s, item \"%s\" not exist!",
__LINE__, filename, item_name);
return ENOENT;
}
return sf_parse_server_info(pServerStr, pServerInfo, default_port);
}
int sf_connect_to_server(const char *ip_addr, const int port, int *sock) int sf_connect_to_server(const char *ip_addr, const int port, int *sock)
{ {
int result; int result;

7
src/sf_func.h
View File

@ -10,13 +10,6 @@
extern "C" { extern "C" {
#endif #endif
int sf_load_server_info(IniContext *pIniContext, const char *filename,
const char *item_name, ConnectionInfo *pServerInfo,
const int default_port);
int sf_parse_server_info(const char *pServerStr, ConnectionInfo *pServerInfo,
const int default_port);
int sf_connect_to_server(const char *ip_addr, const int port, int *sock); int sf_connect_to_server(const char *ip_addr, const int port, int *sock);
#ifdef __cplusplus #ifdef __cplusplus