* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#include <pcap.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
#include "interface.h"
-char * ts_format(register int, register int);
-
/*
* Print out a null-terminated filename (or other ascii string).
* If ep is NULL, assume no truncation check is needed.
ret = 0;
break;
}
- if (!isascii(c)) {
- c = toascii(c);
+ if (!ND_ISASCII(c)) {
+ c = ND_TOASCII(c);
putchar('M');
putchar('-');
}
- if (!isprint(c)) {
+ if (!ND_ISPRINT(c)) {
c ^= 0x40; /* DEL to ?, others to alpha */
putchar('^');
}
while (n > 0 && (ep == NULL || s < ep)) {
n--;
c = *s++;
- if (!isascii(c)) {
- c = toascii(c);
+ if (!ND_ISASCII(c)) {
+ c = ND_TOASCII(c);
putchar('M');
putchar('-');
}
- if (!isprint(c)) {
+ if (!ND_ISPRINT(c)) {
c ^= 0x40; /* DEL to ?, others to alpha */
putchar('^');
}
ret = 0;
break;
}
- if (!isascii(c)) {
- c = toascii(c);
+ if (!ND_ISASCII(c)) {
+ c = ND_TOASCII(c);
putchar('M');
putchar('-');
}
- if (!isprint(c)) {
+ if (!ND_ISPRINT(c)) {
c ^= 0x40; /* DEL to ?, others to alpha */
putchar('^');
}
/*
* Format the timestamp
*/
-char *
+static char *
ts_format(register int sec, register int usec)
{
static char buf[sizeof("00:00:00.000000")];
* Print the timestamp
*/
void
-ts_print(register const struct timeval *tvp)
+ts_print(netdissect_options *ndo,
+ register const struct timeval *tvp)
{
register int s;
struct tm *tm;
int d_usec;
int d_sec;
- switch (tflag) {
+ switch (ndo->ndo_tflag) {
case 0: /* Default */
s = (tvp->tv_sec + thiszone) % 86400;
- (void)printf("%s ", ts_format(s, tvp->tv_usec));
+ ND_PRINT((ndo, "%s ", ts_format(s, tvp->tv_usec)));
break;
case 1: /* No time stamp */
break;
case 2: /* Unix timeval style */
- (void)printf("%u.%06u ",
+ ND_PRINT((ndo, "%u.%06u ",
(unsigned)tvp->tv_sec,
- (unsigned)tvp->tv_usec);
+ (unsigned)tvp->tv_usec));
break;
case 3: /* Microseconds since previous packet */
d_sec--;
}
- (void)printf("%s ", ts_format(d_sec, d_usec));
+ ND_PRINT((ndo, "%s ", ts_format(d_sec, d_usec)));
- if (tflag == 3) { /* set timestamp for last packet */
+ if (ndo->ndo_tflag == 3) { /* set timestamp for last packet */
b_sec = tvp->tv_sec;
b_usec = tvp->tv_usec;
}
Time = (tvp->tv_sec + thiszone) - s;
tm = gmtime (&Time);
if (!tm)
- printf("Date fail ");
+ ND_PRINT((ndo, "Date fail "));
else
- printf("%04d-%02d-%02d %s ",
+ ND_PRINT((ndo, "%04d-%02d-%02d %s ",
tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
- ts_format(s, tvp->tv_usec));
+ ts_format(s, tvp->tv_usec)));
break;
}
}
* is represented as 1y1w1d1h1m1s.
*/
void
-relts_print(int secs)
+relts_print(netdissect_options *ndo,
+ int secs)
{
static const char *lengths[] = {"y", "w", "d", "h", "m", "s"};
static const int seconds[] = {31536000, 604800, 86400, 3600, 60, 1};
const int *s = seconds;
if (secs == 0) {
- (void)printf("0s");
+ ND_PRINT((ndo, "0s"));
return;
}
if (secs < 0) {
- (void)printf("-");
+ ND_PRINT((ndo, "-"));
secs = -secs;
}
while (secs > 0) {
if (secs >= *s) {
- (void)printf("%d%s", secs / *s, *l);
+ ND_PRINT((ndo, "%d%s", secs / *s, *l));
secs -= (secs / *s) * *s;
}
s++;
ident));
return(0);
}
- if (snapend - cp < len)
- len = snapend - cp;
+ if (ndo->ndo_snapend - cp < len)
+ len = ndo->ndo_snapend - cp;
if (len < 0) {
ND_PRINT((ndo,"%sDissector error: print_unknown_data called with pointer past end of packet",
ident));
*/
const char *
tok2strbuf(register const struct tok *lp, register const char *fmt,
- register int v, char *buf, size_t bufsize)
+ register u_int v, char *buf, size_t bufsize)
{
if (lp != NULL) {
while (lp->s != NULL) {
}
if (buflen != 0) { /* did we find anything */
- /* yep, set the the trailing zero 2 bytes before to eliminate the last comma & whitespace */
+ /* yep, set the trailing zero 2 bytes before to eliminate the last comma & whitespace */
buf[buflen-2] = '\0';
return (buf);
}
}
void
-safeputs(const char *s, int maxlen)
+safeputs(netdissect_options *ndo,
+ const u_char *s, const u_int maxlen)
{
- int idx = 0;
+ u_int idx = 0;
while (*s && idx < maxlen) {
- safeputchar(*s);
- idx++;
+ safeputchar(ndo, *s);
+ idx++;
s++;
}
}
void
-safeputchar(int c)
+safeputchar(netdissect_options *ndo,
+ const u_char c)
{
- unsigned char ch;
+ ND_PRINT((ndo, (c < 0x80 && ND_ISPRINT(c)) ? "%c" : "\\0x%02x", c));
+}
- ch = (unsigned char)(c & 0xff);
- if (ch < 0x80 && isprint(ch))
- printf("%c", ch);
- else
- printf("\\0x%02x", ch);
+#ifdef LBL_ALIGN
+/*
+ * Some compilers try to optimize memcpy(), using the alignment constraint
+ * on the argument pointer type. by using this function, we try to avoid the
+ * optimization.
+ */
+void
+unaligned_memcpy(void *p, const void *q, size_t l)
+{
+ memcpy(p, q, l);
+}
+
+/* As with memcpy(), so with memcmp(). */
+int
+unaligned_memcmp(const void *p, const void *q, size_t l)
+{
+ return (memcmp(p, q, l));
}
+#endif
projects / tcpdump / blobdiff