logos: remove obfuscation of personal media.
Oregano doesn't support personal media, and even if
the function comes back the format of the messages will
almost certainly be different. Remove the filtering from
logos.
Change-Id: I58bc080a53ccfd3a339d2883772351120fa75a24
diff --git a/cmds/logos.c b/cmds/logos.c
index 93577ce..57a6d02 100644
--- a/cmds/logos.c
+++ b/cmds/logos.c
@@ -25,7 +25,6 @@
* - cleans up control characters (ie. chars < 32).
* - makes sure output lines are in "facility: message" format.
* - doesn't rely on syslogd.
- * - suppresses logging of filenames of personal media.
*/
#include <assert.h>
#include <ctype.h>
@@ -460,48 +459,6 @@
}
-/*
- * Return true for a character which we expect to terminate a
- * media filename.
- */
-static int is_filename_terminator(char c) {
- switch(c) {
- case ' ':
- case '\'':
- case '"':
- return 1;
- }
-
- return 0;
-}
-
-/*
- * search for text patterns which look like filenames of
- * personal media, and cross out the filename portion with
- * 'X' characters.
- */
-static void suppress_media_filenames(uint8_t *line, ssize_t len,
- const char *path) {
- uint8_t *s = line;
- ssize_t pathlen = strlen(path);
-
- while (len > pathlen) {
- if (strncmp((char *)s, path, pathlen) == 0) {
- /* Found a filename, blot it out. */
- s += pathlen;
- len -= pathlen;
- while (len > 0 && !is_filename_terminator(*s)) {
- *s++ = 'X';
- len--;
- }
- } else {
- s += 1;
- len -= 1;
- }
- }
-}
-
-
static void usage(void) {
fprintf(stderr,
"Usage: [LOGOS_DEBUG=1] logos <facilityname> [bytes/burst] [bytes/day]\n"
@@ -657,8 +614,6 @@
uint8_t *start = buf, *next = buf + used, *end = buf + used + got, *p;
while ((p = memchr(next, '\n', end - next)) != NULL) {
ssize_t linelen = p - start;
- suppress_media_filenames(start, linelen, "/var/media/pictures/");
- suppress_media_filenames(start, linelen, "/var/media/videos/");
flush(header, headerlen, start, linelen);
if (overlong) {
// that flush() was the first newline after buffer length
diff --git a/cmds/test-logos.py b/cmds/test-logos.py
index d930ccb..34f5693 100755
--- a/cmds/test-logos.py
+++ b/cmds/test-logos.py
@@ -86,23 +86,6 @@
os.write(fd1, '\n')
WVPASSEQ('<7>fac: booga!\n', _Read())
- # Filenames
- os.write(fd1, 'Accessing /var/media/pictures/MyPicture.jpg for decode\n')
- WVPASSEQ('<7>fac: Accessing /var/media/pictures/XXXXXXXXXXXXX for decode\n',
- _Read())
- os.write(fd1, '/var/media/pictures/MyPicture.jpg\n')
- WVPASSEQ('<7>fac: /var/media/pictures/XXXXXXXXXXXXX\n',
- _Read())
- os.write(fd1, 'Accessing /var/media/videos/MyMovie.mpg for decode\n')
- WVPASSEQ('<7>fac: Accessing /var/media/videos/XXXXXXXXXXX for decode\n',
- _Read())
- os.write(fd1, 'Accessing /var/media/tv/MyTvShow.ts for decode\n')
- WVPASSEQ('<7>fac: Accessing /var/media/tv/MyTvShow.ts for decode\n',
- _Read())
- os.write(fd1, 'check "/var/media/videos/MyTvShow.ts"len=1024\n')
- WVPASSEQ('<7>fac: check "/var/media/videos/XXXXXXXXXXX"len=1024\n',
- _Read())
-
# rate limiting
os.write(fd1, (('x'*80) + '\n') * 500)
result = ''
