#ifdef __KERNEL__
+#if __linux__
# include <linux/unistd.h>
# include <linux/signal.h>
+#endif
#else /* ! __KERNEL__ */
+#ifdef __APPLE__
+#define _XOPEN_SOURCE
+#endif
+
#define _GNU_SOURCE /* to get REG_* in ucontext.h */
#include <ucontext.h>
#undef _GNU_SOURCE
#include <unistd.h>
#include <signal.h>
+#include <grp.h>
#include <time.h>
#include <sys/socket.h>
#include <math.h>
#include <vppinfra/time.h>
+#if __linux__
+#include <vppinfra/linux/syscall.h>
#ifdef AF_NETLINK
#include <linux/types.h>
#include <linux/netlink.h>
#endif
+#endif
#endif /* ! __KERNEL__ */
{
void * v = va_arg (*args, void *);
struct sockaddr * sa = v;
+ static u32 local_counter;
switch (sa->sa_family)
{
}
break;
+ case AF_LOCAL:
+ {
+ /*
+ * There isn't anything useful to print.
+ * The unix cli world uses the output to make a node name,
+ * so we need to return a unique name.
+ */
+ s = format (s, "local:%u", local_counter++);
+ }
+ break;
+
#ifndef __KERNEL__
#ifdef AF_NETLINK
case AF_NETLINK:
return s;
}
+#ifndef __APPLE__
u8 * format_tcp4_packet (u8 * s, va_list * args)
{
u8 * p = va_arg (*args, u8 *);
struct ethhdr * h = va_arg (*args, struct ethhdr *);
uword proto = h->h_proto;
u8 * payload = (void *) (h + 1);
- uword indent;
+ u32 indent;
/* Check for 802.2/802.3 encapsulation. */
if (proto < ETH_DATA_LEN)
break;
case 'm':
what = tm->tm_mon + 1;
- what_fmt = "%2d";
+ what_fmt = "%02d";
break;
case 'd':
what = tm->tm_mday;
- what_fmt = "%2d";
+ what_fmt = "%02d";
break;
case 'H':
what = tm->tm_hour;
return s;
}
+#endif
u8 * format_time_float (u8 * s, va_list * args)
{
return format (s, "%p", regs[reg_no]);
}
+__clib_export uword
+unformat_unix_gid (unformat_input_t * input, va_list * args)
+{
+ gid_t *gid = va_arg (*args, gid_t *);
+ struct group *grp = 0;
+ int r;
+ u8 *s;
+
+ if (unformat (input, "%d", &r))
+ {
+ grp = getgrgid (r);
+ }
+ else if (unformat (input, "%s", &s))
+ {
+ grp = getgrnam ((char *) s);
+ vec_free (s);
+ }
+ if (grp)
+ {
+ *gid = grp->gr_gid;
+ return 1;
+ }
+ return 0;
+}
+
#endif /* __KERNEL__ */