AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

OpenVPN: merge OvsParseOptions() and OvsParsePeerInfo() into a single function

Browse Source
This commit is contained in:
Davide Beatrici 2018-04-05 22:28:23 +02:00
parent 86c82b8ccf
commit 970e217380
2 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/Cedar/Interop_OpenVPN.c
View File

@ -707,7 +707,7 @@ void OvsBeginIPCAsyncConnectionIfEmpty(OPENVPN_SERVER *s, OPENVPN_SESSION *se, O
// if the option --push-peer-info is enabled. // if the option --push-peer-info is enabled.
// It also sends all of the client's environment // It also sends all of the client's environment
// variables whose names start with "UV_". // variables whose names start with "UV_".
pi = OvsParsePeerInfo(c->ClientKey.PeerInfo); pi = OvsParseData(c->ClientKey.PeerInfo, OPENVPN_DATA_PEERINFO);
// Check presence of custom hostname // Check presence of custom hostname
if (OvsHasEntry(pi, "UV_HOSTNAME")) if (OvsHasEntry(pi, "UV_HOSTNAME"))
@ -832,7 +832,7 @@ void OvsSetupSessionParameters(OPENVPN_SERVER *s, OPENVPN_SESSION *se, OPENVPN_C
StrCpy(opt_str, sizeof(opt_str), s->Cedar->OpenVPNDefaultClientOption); StrCpy(opt_str, sizeof(opt_str), s->Cedar->OpenVPNDefaultClientOption);
} }
o = OvsParseOptions(opt_str); o = OvsParseData(opt_str, OPENVPN_DATA_OPTIONS);
if (se->Mode == OPENVPN_MODE_UNKNOWN) if (se->Mode == OPENVPN_MODE_UNKNOWN)
{ {
@ -984,13 +984,13 @@ MD *OvsGetMd(char *name)
return m; return m;
} }
// Parse the option string // Parse data string
LIST *OvsParseOptions(char *str) LIST *OvsParseData(char *str, int type)
{ {
LIST *o = NewListFast(NULL); LIST *o = NewListFast(NULL);
TOKEN_LIST *t; TOKEN_LIST *t;
t = ParseTokenWithoutNullStr(str, ","); t = ParseTokenWithoutNullStr(str, type == OPENVPN_DATA_OPTIONS ? "," : "\n");
if (t != NULL) if (t != NULL)
{ {
UINT i; UINT i;
@ -1002,42 +1002,7 @@ LIST *OvsParseOptions(char *str)
char *line = t->Token[i]; char *line = t->Token[i];
Trim(line); Trim(line);
if (GetKeyAndValue(line, key, sizeof(key), value, sizeof(value), " \t")) if (GetKeyAndValue(line, key, sizeof(key), value, sizeof(value), type == OPENVPN_DATA_OPTIONS ? " \t" : "=\t"))
{
INI_ENTRY *e = ZeroMalloc(sizeof(INI_ENTRY));
e->Key = CopyStr(key);
e->Value = CopyStr(value);
Add(o, e);
}
}
FreeToken(t);
}
return o;
}
// Parse the peer info string
LIST *OvsParsePeerInfo(char *str)
{
LIST *o = NewListFast(NULL);
TOKEN_LIST *t;
t = ParseTokenWithoutNullStr(str, "\n");
if (t != NULL)
{
UINT i;
for (i = 0;i < t->NumTokens;i++)
{
char key[MAX_SIZE];
char value[MAX_SIZE];
char *line = t->Token[i];
Trim(line);
if (GetKeyAndValue(line, key, sizeof(key), value, sizeof(value), "=\t"))
{ {
INI_ENTRY *e = ZeroMalloc(sizeof(INI_ENTRY)); INI_ENTRY *e = ZeroMalloc(sizeof(INI_ENTRY));

7
src/Cedar/Interop_OpenVPN.h
View File

@ -190,6 +190,10 @@
#define OPENVPN_MODE_L2 1 // TAP (Ethernet) #define OPENVPN_MODE_L2 1 // TAP (Ethernet)
#define OPENVPN_MODE_L3 2 // TUN (IP) #define OPENVPN_MODE_L3 2 // TUN (IP)
// Data
#define OPENVPN_DATA_OPTIONS 0
#define OPENVPN_DATA_PEERINFO 1
//// Type //// Type
@ -361,8 +365,7 @@ void OvsSetupSessionParameters(OPENVPN_SERVER *s, OPENVPN_SESSION *se, OPENVPN_C
BUF *OvsBuildKeyMethod2(OPENVPN_KEY_METHOD_2 *d); BUF *OvsBuildKeyMethod2(OPENVPN_KEY_METHOD_2 *d);
void OvsWriteStringToBuf(BUF *b, char *str, UINT max_size); void OvsWriteStringToBuf(BUF *b, char *str, UINT max_size);
LIST *OvsParseOptions(char *str); LIST *OvsParseData(char *str, int type);
LIST *OvsParsePeerInfo(char *str);
void OvsFreeList(LIST *o); void OvsFreeList(LIST *o);
LIST *OvsNewList(); LIST *OvsNewList();
void OvsAddEntry(LIST *o, char *key, char *value); void OvsAddEntry(LIST *o, char *key, char *value);