rpms/iptraf/devel iptraf-3.0.0-ifname.patch, NONE, 1.1 iptraf.spec, 1.30, 1.31
Zdenek Prikryl (zprikryl)
fedora-extras-commits at redhat.com
Tue Apr 15 09:27:00 UTC 2008
Author: zprikryl
Update of /cvs/extras/rpms/iptraf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9216
Modified Files:
iptraf.spec
Added Files:
iptraf-3.0.0-ifname.patch
Log Message:
Length of iface name is increased
Resolves #439201
iptraf-3.0.0-ifname.patch:
--- NEW FILE iptraf-3.0.0-ifname.patch ---
--- ./src/hostmon.c.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/hostmon.c 2007-01-31 12:22:55.000000000 -0800
@@ -711,7 +711,7 @@
int is_ip;
int ch;
- char ifname[10];
+ char ifname[18];
struct timeval tv;
unsigned long starttime;
--- ./src/hostmon.h.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/hostmon.h 2007-01-31 12:22:59.000000000 -0800
@@ -25,7 +25,7 @@
char eth_addr[ETH_ALEN];
char ascaddr[15];
char desc[65];
- char ifname[10];
+ char ifname[18];
int withdesc;
int printed;
unsigned int linktype;
--- ./src/ifstats.c.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/ifstats.c 2007-01-31 12:23:03.000000000 -0800
@@ -128,7 +128,7 @@
void initiflist(struct iflist **list)
{
FILE *fd;
- char ifname[10];
+ char ifname[18];
struct iflist *itmp = NULL;
struct iflist *tail = NULL;
unsigned int index = 0;
@@ -430,7 +430,7 @@
FILE *logfile = NULL;
int br;
- char ifname[10];
+ char ifname[18];
int ch;
@@ -757,7 +757,7 @@
char *tpacket;
unsigned int iphlen;
- char ifname[10];
+ char ifname[18];
struct sockaddr_ll fromaddr;
unsigned short linktype;
--- ./src/ifstats.h.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/ifstats.h 2007-01-31 12:23:13.000000000 -0800
@@ -6,7 +6,7 @@
***/
struct iflist {
- char ifname[8];
+ char ifname[18];
unsigned int encap;
unsigned long long iptotal;
unsigned long badtotal;
--- ./src/iptraf.c.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/iptraf.c 2007-01-31 12:23:19.000000000 -0800
@@ -235,7 +235,7 @@
struct filterstate ofilter;
struct ffnode *fltfiles;
- char ifname[10];
+ char ifname[18];
char *ifptr = NULL;
struct porttab *ports;
--- ./src/isdntab.h.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/isdntab.h 2007-01-31 12:23:23.000000000 -0800
@@ -1,5 +1,5 @@
struct isdntabent {
- char ifname[10];
+ char ifname[18];
unsigned int encap;
struct isdntabent *next_entry;
};
--- ./src/itrafmon.c.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/itrafmon.c 2007-01-31 12:23:26.000000000 -0800
@@ -604,7 +604,7 @@
int curwin = 0;
int readlen;
- char ifname[10];
+ char ifname[18];
unsigned long long total_pkts = 0;
--- ./src/promisc.h.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/promisc.h 2007-01-31 12:23:29.000000000 -0800
@@ -9,7 +9,7 @@
*/
struct promisc_params {
- char ifname[8];
+ char ifname[18];
int saved_state;
int state_valid;
};
--- ./src/tcptable.h.old 2007-01-31 12:20:24.000000000 -0800
+++ ./src/tcptable.h 2007-01-31 12:23:45.000000000 -0800
@@ -64,7 +64,7 @@
unsigned long finack;
int partial;
int finsent;
- char ifname[8];
+ char ifname[18];
unsigned int index;
int reused;
int timedout;
--- ./src/ifstats.c.old 2007-01-31 12:53:22.000000000 -0800
+++ ./src/ifstats.c 2007-01-31 12:55:09.000000000 -0800
@@ -142,7 +142,7 @@
return;
}
- while (get_next_iface(fd, ifname, 8)) {
+ while (get_next_iface(fd, ifname, 12)) {
if (strcmp(ifname, "") != 0) {
if (!(iface_supported(ifname)))
continue;
--- ./src/promisc.c.old 2007-01-31 12:53:28.000000000 -0800
+++ ./src/promisc.c 2007-01-31 12:54:46.000000000 -0800
@@ -49,7 +49,7 @@
{
FILE *fd;
int ifd;
- char buf[8];
+ char buf[18];
struct promisc_states *ptmp;
struct promisc_states *tail = NULL;
struct ifreq ifr;
@@ -61,7 +61,7 @@
*list = NULL;
fd = open_procnetdev();
- while (get_next_iface(fd, buf, 8)) {
+ while (get_next_iface(fd, buf, 12)) {
if (strcmp(buf, "") != 0) {
ptmp = malloc(sizeof(struct promisc_states));
strcpy(ptmp->params.ifname, buf);
--- ./src/othptab.h.old 2007-01-31 13:04:48.000000000 -0800
+++ ./src/othptab.h 2007-01-31 13:06:17.000000000 -0800
@@ -42,7 +42,7 @@
int s_fstat;
int d_fstat;
unsigned int protocol;
- char iface[8];
+ char iface[18];
unsigned int pkt_length;
union {
--- ./src/pktsize.c.old 2007-01-31 13:05:03.000000000 -0800
+++ ./src/pktsize.c 2007-01-31 13:06:32.000000000 -0800
@@ -175,7 +175,7 @@
char buf[MAX_PACKET_SIZE];
int br;
char *ipacket;
- char iface[10];
+ char iface[18];
unsigned int mtu;
struct sockaddr_ll fromaddr;
--- ./src/serv.c.old 2007-01-31 13:05:07.000000000 -0800
+++ ./src/serv.c 2007-01-31 13:06:44.000000000 -0800
@@ -739,7 +739,7 @@
unsigned short linktype;
int br;
- char iface[8];
+ char iface[18];
unsigned int idx = 1;
unsigned int sport = 0;
Index: iptraf.spec
===================================================================
RCS file: /cvs/extras/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- iptraf.spec 19 Feb 2008 14:28:39 -0000 1.30
+++ iptraf.spec 15 Apr 2008 09:26:22 -0000 1.31
@@ -1,7 +1,7 @@
Summary: A console-based network monitoring utility
Name: iptraf
Version: 3.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Source0: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
Source1: iptraf
URL: http://iptraf.seul.org
@@ -15,6 +15,7 @@
Patch7: iptraf-3.0.1-compile.fix.patch
Patch8: iptraf-3.0.0-in_trafic.patch
Patch9: iptraf-3.0.1-incltypes.patch
+Patch10: iptraf-3.0.0-ifname.patch
License: GPLv2+
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p0
%build
make -C src CFLAGS="$RPM_OPT_FLAGS" \
@@ -92,6 +94,10 @@
%dir %attr(644,root,root) %config(noreplace) /etc/logrotate.d/iptraf
%changelog
+* Tue Apr 15 2008 Zdenek Prikryl <zprikryl at redhat.com> - 3.0.1-4
+- Length of iface name is increased
+- Resolves #439201
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.0.1-3
- Autorebuild for GCC 4.3
More information about the fedora-extras-commits
mailing list