aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Delalande <colona@arista.com>2017-10-06 16:48:19 -0700
committerStephen Hemminger <stephen@networkplumber.org>2017-10-11 11:04:47 -0700
commit7c72df5a95174c21bdc4ca09cd15a88c0c10e568 (patch)
tree5f36247552a86257ed843130c0db91c18ad6a072
parent4f6b73380d2c84b98b7beffe6ca73f635ab72a06 (diff)
downloadplatform_external_iproute2-7c72df5a95174c21bdc4ca09cd15a88c0c10e568.tar.gz
platform_external_iproute2-7c72df5a95174c21bdc4ca09cd15a88c0c10e568.tar.bz2
platform_external_iproute2-7c72df5a95174c21bdc4ca09cd15a88c0c10e568.zip
utils: add print_escape_buf to format and print arbitrary bytes
Keep it as simple as possible for now: just escape anything that is not isprint-able, is among the "escape" parameter or '\' as an octal escape sequence. This should be pretty easy to extend if any other user needs something more complex in the future. Signed-off-by: Ivan Delalande <colona@arista.com>
-rw-r--r--include/utils.h2
-rw-r--r--lib/utils.c15
2 files changed, 17 insertions, 0 deletions
diff --git a/include/utils.h b/include/utils.h
index 76addb32..3d91c50d 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -195,6 +195,8 @@ static inline void __jiffies_to_tv(struct timeval *tv, unsigned long jiffies)
tv->tv_usec = tvusec - 1000000 * tv->tv_sec;
}
+void print_escape_buf(const __u8 *buf, size_t len, const char *escape);
+
int print_timestamp(FILE *fp);
void print_nlmsg_timestamp(FILE *fp, const struct nlmsghdr *n);
diff --git a/lib/utils.c b/lib/utils.c
index 632fd0dd..ac155bf5 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -31,6 +31,7 @@
#include <time.h>
#include <sys/time.h>
#include <errno.h>
+#include <ctype.h>
#include "rt_names.h"
#include "utils.h"
@@ -1047,6 +1048,20 @@ int addr64_n2a(__u64 addr, char *buff, size_t len)
return written;
}
+/* Print buffer and escape bytes that are !isprint or among 'escape' */
+void print_escape_buf(const __u8 *buf, size_t len, const char *escape)
+{
+ size_t i;
+
+ for (i = 0; i < len; ++i) {
+ if (isprint(buf[i]) && buf[i] != '\\' &&
+ !strchr(escape, buf[i]))
+ printf("%c", buf[i]);
+ else
+ printf("\\%03o", buf[i]);
+ }
+}
+
int print_timestamp(FILE *fp)
{
struct timeval tv;