1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

Handle private differently-prototyped ether_ntoa()

This commit is contained in:
Bill Fenner 2001-03-10 01:38:28 +00:00
parent 1540cc61a5
commit 201d12605a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=39331
2 changed files with 45 additions and 0 deletions

View File

@ -0,0 +1,22 @@
/usr/bin/diff --ignore-matching-lines=.*{$Id:|$Header:}.* -u tcptrace.h.orig tcptrace.h
--- tcptrace.h.orig Fri Mar 9 17:30:34 2001
+++ tcptrace.h Fri Mar 9 17:31:08 2001
@@ -485,7 +485,7 @@
/* external routine decls */
double sqrt(double x);
-char *ether_ntoa(struct ether_addr *e);
+char *shawn_ether_ntoa(struct ether_addr *e);
void free(void *);
int finite(double);
@@ -681,7 +680,9 @@
#define IPTOS_CE 0x01 /* Experienced Congestion */
#define TH_ECN_ECHO 0x02 /* Used by receiver to echo CE bit */
+#ifndef TH_CWR
#define TH_CWR 0x01 /* Congestion Window Reduced */
+#endif

View File

@ -0,0 +1,23 @@
/usr/bin/diff --ignore-matching-lines=.*{$Id:|$Header:}.* -u print.c.orig print.c
--- print.c.orig Fri Mar 9 17:33:16 2001
+++ print.c Fri Mar 9 17:34:12 2001
@@ -110,8 +110,8 @@
printeth_packet(
struct ether_header *pep)
{
- printf("\tETH Srce: %s\n", ether_ntoa((struct ether_addr *)&pep->ether_shost));
- printf("\tETH Dest: %s\n", ether_ntoa((struct ether_addr *)&pep->ether_dhost));
+ printf("\tETH Srce: %s\n", shawn_ether_ntoa((struct ether_addr *)&pep->ether_shost));
+ printf("\tETH Dest: %s\n", shawn_ether_ntoa((struct ether_addr *)&pep->ether_dhost));
printf(
hex?"\t Type: 0x%x %s\n":"\t Type: %d %s\n",
@@ -708,7 +708,7 @@
/* and it messes up my cross-platform testing. I'll just do it the */
/* "one true" way! :-) */
char *
-ether_ntoa (struct ether_addr *e)
+shawn_ether_ntoa (struct ether_addr *e)
{
unsigned char *pe;
static char buf[30];