osmocom
/
osmo-sysmon
mirror of https://gerrit.osmocom.org/osmo-sysmon
11
0
Fork 0
Code Releases Activity

openvpn: Fix garbage printed after remote port 

Last strtok() returns chunk from last "," until end of strig. Since
openvpn sends a trailing new line + "END" string, that was being copied
into the remote port.

Change-Id: Ie24fed9c64bc482fd5af8bc9d03d37937c6471bf
This commit is contained in:
Pau Espin 2019-03-15 20:53:35 +01:00
parent a3a92ecc5c
commit 3d13718ce7
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/osysmon_openvpn.c
View File

@ -59,11 +59,19 @@ struct openvpn_client {
bool connected;
};
/*
* The string format is documented in https://openvpn.net/community-resources/management-interface/
* Conversation loop looks like this (non-null terminated strings):
* CLI -> SRV: "state"
* SRV -> CLI: "1552674378,CONNECTED,SUCCESS,10.8.0.11,144.76.43.77,1194,," {0x0d, 0xa} "END" {0x0d, 0xa}
* More or less comma-separated fields are returned depending on OpenVPN version.
* v2.1.3: Sends only up to field 4 incl, eg: "1552674378,CONNECTED,SUCCESS,10.8.0.11,144.76.43.77" {0x0d, 0xa} "END" {0x0d, 0xa}
*/
static char *parse_state(struct msgb *msg, struct openvpn_client *vpn)
{
char tmp[128], buf[128];
char *tok;
unsigned int i = 0;
unsigned int i;
uint8_t *m = msgb_data(msg);
unsigned int truncated_len = OSMO_MIN(sizeof(tmp) - 1, msgb_length(msg));
@ -81,8 +89,15 @@ static char *parse_state(struct msgb *msg, struct openvpn_client *vpn)
memcpy(tmp, m, truncated_len);
tmp[truncated_len] = '\0';
for (tok = strtok(tmp, ","); tok && i < MAX_RESP_COMPONENTS; tok = strtok(NULL, ",")) {
/* The string format is documented in https://openvpn.net/community-resources/management-interface/ */
/* Only interested in first line; Remove return carriage, line feed + new line string "END" */
for (i = 0; i < truncated_len; i++) {
if (!isprint(tmp[i])) {
tmp[i] = '\0';
break;
}
}
for (tok = strtok(tmp, ","), i = 0; tok && i < MAX_RESP_COMPONENTS; tok = strtok(NULL, ",")) {
if (tok) { /* Parse csv string and pick interesting tokens while ignoring the rest. */
switch (i++) {
/* case 0: unix/date time, not needed */