Skip to content
This repository was archived by the owner on Nov 22, 2017. It is now read-only.

Fixed two bugs that were wrecking my collectd servers, notes included in each commit. #14

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed two bugs that were wrecking my collectd servers, notes included in each commit. #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df37c66
Fixed wg_copy_escape_part writing an escape_char when it encounters t…
dnf Mar 9, 2012
414f4e3
Fixed wg_format_name printing garbage into string when ds_name is NUL…
dnf Mar 9, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions src/write_graphite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,22 +351,25 @@ static void wg_copy_escape_part (char *dst, const char *src, size_t dst_len,
{
size_t i;

memset (dst, 0, dst_len);

if (src == NULL)
{
dst[0] = 0;
return;
}

for (i = 0; i < dst_len; i++)
{
if ((src[i] == '.')
if (src[i] == 0)
{
dst[i] = '\0';
break;
}
else if ((src[i] == '.')
|| isspace ((int) src[i])
|| iscntrl ((int) src[i]))
dst[i] = escape_char;
else
dst[i] = src[i];

if (src[i] == 0)
break;
}
}

Expand All @@ -387,7 +390,6 @@ static int wg_format_name (char *ret, int ret_len,
assert (hostname != NULL);
assert (plugin != NULL);
assert (type != NULL);
assert (ds_name != NULL);

if (prefix == NULL)
prefix = "";
Expand All @@ -410,34 +412,44 @@ static int wg_format_name (char *ret, int ret_len,
{
if (n_type_instance[0] == '\0')
{
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s",
prefix, n_hostname, postfix, n_plugin, n_type, ds_name);
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s",
prefix, n_hostname, postfix, n_plugin, n_type);
}
else
{
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s-%s.%s",
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s-%s",
prefix, n_hostname, postfix, n_plugin, n_type,
n_type_instance, ds_name);
n_type_instance);
}
}
else
{
if (n_type_instance[0] == '\0')
{
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s.%s",
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s",
prefix, n_hostname, postfix, n_plugin,
n_plugin_instance, n_type, ds_name);
n_plugin_instance, n_type);
}
else
{
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s-%s.%s",
status = ssnprintf (ret, ret_len, "%s%s%s.%s.%s.%s-%s",
prefix, n_hostname, postfix, n_plugin,
n_plugin_instance, n_type, n_type_instance, ds_name);
n_plugin_instance, n_type, n_type_instance);
}
}

if ((status < 1) || (status >= ret_len))
return (-1);

if( ds_name )
{
int ret_remaining = ret_len - status;

status = ssnprintf( ret + status, ret_remaining, ".%s", ds_name );

if ((status < 1) || (status >= ret_remaining))
return (-1);
}

return (0);
}
Expand Down