]> git.pld-linux.org Git - packages/ipvsadm.git/commitdiff
- dropped 6-year old ip_vs.h file; internal libipvs contains more recent version auto/th/ipvsadm-1_26-1
authorJakub Bogusz <qboosh@pld-linux.org>
Fri, 18 Mar 2011 15:32:46 +0000 (15:32 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    ipvsadm-ip_vs.h -> 1.4
    ipvsadm-make.patch -> 1.6
    ipvsadm.spec -> 1.27

ipvsadm-ip_vs.h [deleted file]
ipvsadm-make.patch
ipvsadm.spec

diff --git a/ipvsadm-ip_vs.h b/ipvsadm-ip_vs.h
deleted file mode 100644 (file)
index 3921b65..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- *      IP Virtual Server
- *      data structure and functionality definitions
- */
-
-#ifndef _IP_VS_H
-#define _IP_VS_H
-
-#include <asm/types.h>         /* For __uXX types */
-
-#define IP_VS_VERSION_CODE     0x010201
-#define NVERSION(version)                      \
-       (version >> 16) & 0xFF,                 \
-       (version >> 8) & 0xFF,                  \
-       version & 0xFF
-
-/*
- *      Virtual Service Flags
- */
-#define IP_VS_SVC_F_PERSISTENT 0x0001          /* persistent port */
-#define IP_VS_SVC_F_HASHED     0x0002          /* hashed entry */
-
-/*
- *      Destination Server Flags
- */
-#define IP_VS_DEST_F_AVAILABLE 0x0001          /* server is available */
-#define IP_VS_DEST_F_OVERLOAD  0x0002          /* server is overloaded */
-
-/*
- *      IPVS sync daemon states
- */
-#define IP_VS_STATE_NONE       0x0000          /* daemon is stopped */
-#define IP_VS_STATE_MASTER     0x0001          /* started as master */
-#define IP_VS_STATE_BACKUP     0x0002          /* started as backup */
-
-/*
- *      IPVS socket options
- */
-#define IP_VS_BASE_CTL         (64+1024+64)            /* base */
-
-#define IP_VS_SO_SET_NONE      IP_VS_BASE_CTL          /* just peek */
-#define IP_VS_SO_SET_INSERT    (IP_VS_BASE_CTL+1)
-#define IP_VS_SO_SET_ADD       (IP_VS_BASE_CTL+2)
-#define IP_VS_SO_SET_EDIT      (IP_VS_BASE_CTL+3)
-#define IP_VS_SO_SET_DEL       (IP_VS_BASE_CTL+4)
-#define IP_VS_SO_SET_FLUSH     (IP_VS_BASE_CTL+5)
-#define IP_VS_SO_SET_LIST      (IP_VS_BASE_CTL+6)
-#define IP_VS_SO_SET_ADDDEST   (IP_VS_BASE_CTL+7)
-#define IP_VS_SO_SET_DELDEST   (IP_VS_BASE_CTL+8)
-#define IP_VS_SO_SET_EDITDEST  (IP_VS_BASE_CTL+9)
-#define IP_VS_SO_SET_TIMEOUT   (IP_VS_BASE_CTL+10)
-#define IP_VS_SO_SET_STARTDAEMON (IP_VS_BASE_CTL+11)
-#define IP_VS_SO_SET_STOPDAEMON (IP_VS_BASE_CTL+12)
-#define IP_VS_SO_SET_RESTORE    (IP_VS_BASE_CTL+13)
-#define IP_VS_SO_SET_SAVE       (IP_VS_BASE_CTL+14)
-#define IP_VS_SO_SET_ZERO      (IP_VS_BASE_CTL+15)
-#define IP_VS_SO_SET_MAX       IP_VS_SO_SET_ZERO
-
-#define IP_VS_SO_GET_VERSION   IP_VS_BASE_CTL
-#define IP_VS_SO_GET_INFO      (IP_VS_BASE_CTL+1)
-#define IP_VS_SO_GET_SERVICES  (IP_VS_BASE_CTL+2)
-#define IP_VS_SO_GET_SERVICE   (IP_VS_BASE_CTL+3)
-#define IP_VS_SO_GET_DESTS     (IP_VS_BASE_CTL+4)
-#define IP_VS_SO_GET_DEST      (IP_VS_BASE_CTL+5)      /* not used now */
-#define IP_VS_SO_GET_TIMEOUT   (IP_VS_BASE_CTL+6)
-#define IP_VS_SO_GET_DAEMON    (IP_VS_BASE_CTL+7)
-#define IP_VS_SO_GET_MAX       IP_VS_SO_GET_DAEMON
-
-
-/*
- *      IPVS Connection Flags
- */
-#define IP_VS_CONN_F_FWD_MASK  0x0007          /* mask for the fwd methods */
-#define IP_VS_CONN_F_MASQ      0x0000          /* masquerading/NAT */
-#define IP_VS_CONN_F_LOCALNODE 0x0001          /* local node */
-#define IP_VS_CONN_F_TUNNEL    0x0002          /* tunneling */
-#define IP_VS_CONN_F_DROUTE    0x0003          /* direct routing */
-#define IP_VS_CONN_F_BYPASS    0x0004          /* cache bypass */
-#define IP_VS_CONN_F_SYNC      0x0020          /* entry created by sync */
-#define IP_VS_CONN_F_HASHED    0x0040          /* hashed entry */
-#define IP_VS_CONN_F_NOOUTPUT  0x0080          /* no output packets */
-#define IP_VS_CONN_F_INACTIVE  0x0100          /* not established */
-#define IP_VS_CONN_F_OUT_SEQ   0x0200          /* must do output seq adjust */
-#define IP_VS_CONN_F_IN_SEQ    0x0400          /* must do input seq adjust */
-#define IP_VS_CONN_F_SEQ_MASK  0x0600          /* in/out sequence mask */
-#define IP_VS_CONN_F_NO_CPORT  0x0800          /* no client port set yet */
-
-/* Move it to better place one day, for now keep it unique */
-#define NFC_IPVS_PROPERTY      0x10000
-
-#define IP_VS_SCHEDNAME_MAXLEN 16
-#define IP_VS_IFNAME_MAXLEN    16
-
-
-/*
- *     The struct ip_vs_service_user and struct ip_vs_dest_user are
- *     used to set IPVS rules through setsockopt.
- */
-struct ip_vs_service_user {
-       /* virtual service addresses */
-       u_int16_t               protocol;
-       u_int32_t               addr;           /* virtual ip address */
-       u_int16_t               port;
-       u_int32_t               fwmark;         /* firwall mark of service */
-
-       /* virtual service options */
-       char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
-       unsigned                flags;          /* virtual service flags */
-       unsigned                timeout;        /* persistent timeout in sec */
-       u_int32_t               netmask;        /* persistent netmask */
-};
-
-
-struct ip_vs_dest_user {
-       /* destination server address */
-       u_int32_t               addr;
-       u_int16_t               port;
-
-       /* real server options */
-       unsigned                conn_flags;     /* connection flags */
-       int                     weight;         /* destination weight */
-
-       /* thresholds for active connections */
-       u_int32_t               u_threshold;    /* upper threshold */
-       u_int32_t               l_threshold;    /* lower threshold */
-};
-
-
-/*
- *     IPVS statistics object (for user space)
- */
-struct ip_vs_stats_user
-{
-       __u32                   conns;          /* connections scheduled */
-       __u32                   inpkts;         /* incoming packets */
-       __u32                   outpkts;        /* outgoing packets */
-       __u64                   inbytes;        /* incoming bytes */
-       __u64                   outbytes;       /* outgoing bytes */
-
-       __u32                   cps;            /* current connection rate */
-       __u32                   inpps;          /* current in packet rate */
-       __u32                   outpps;         /* current out packet rate */
-       __u32                   inbps;          /* current in byte rate */
-       __u32                   outbps;         /* current out byte rate */
-};
-
-
-/* The argument to IP_VS_SO_GET_INFO */
-struct ip_vs_getinfo {
-       /* version number */
-       unsigned int            version;
-
-       /* size of connection hash table */
-       unsigned int            size;
-
-       /* number of virtual services */
-       unsigned int            num_services;
-};
-
-
-/* The argument to IP_VS_SO_GET_SERVICE */
-struct ip_vs_service_entry {
-       /* which service: user fills in these */
-       u_int16_t               protocol;
-       u_int32_t               addr;           /* virtual address */
-       u_int16_t               port;
-       u_int32_t               fwmark;         /* firwall mark of service */
-
-       /* service options */
-       char                    sched_name[IP_VS_SCHEDNAME_MAXLEN];
-       unsigned                flags;          /* virtual service flags */
-       unsigned                timeout;        /* persistent timeout */
-       u_int32_t               netmask;        /* persistent netmask */
-
-       /* number of real servers */
-       unsigned int            num_dests;
-
-       /* statistics */
-       struct ip_vs_stats_user stats;
-};
-
-
-struct ip_vs_dest_entry {
-       u_int32_t               addr;           /* destination address */
-       u_int16_t               port;
-       unsigned                conn_flags;     /* connection flags */
-       int                     weight;         /* destination weight */
-
-       u_int32_t               u_threshold;    /* upper threshold */
-       u_int32_t               l_threshold;    /* lower threshold */
-
-       u_int32_t               activeconns;    /* active connections */
-       u_int32_t               inactconns;     /* inactive connections */
-       u_int32_t               persistconns;   /* persistent connections */
-
-       /* statistics */
-       struct ip_vs_stats_user stats;
-};
-
-
-/* The argument to IP_VS_SO_GET_DESTS */
-struct ip_vs_get_dests {
-       /* which service: user fills in these */
-       u_int16_t               protocol;
-       u_int32_t               addr;           /* virtual address */
-       u_int16_t               port;
-       u_int32_t               fwmark;         /* firwall mark of service */
-
-       /* number of real servers */
-       unsigned int            num_dests;
-
-       /* the real servers */
-       struct ip_vs_dest_entry entrytable[0];
-};
-
-
-/* The argument to IP_VS_SO_GET_SERVICES */
-struct ip_vs_get_services {
-       /* number of virtual services */
-       unsigned int            num_services;
-
-       /* service table */
-       struct ip_vs_service_entry entrytable[0];
-};
-
-
-/* The argument to IP_VS_SO_GET_TIMEOUT */
-struct ip_vs_timeout_user {
-       int                     tcp_timeout;
-       int                     tcp_fin_timeout;
-       int                     udp_timeout;
-};
-
-
-/* The argument to IP_VS_SO_GET_DAEMON */
-struct ip_vs_daemon_user {
-       /* sync daemon state (master/backup) */
-       int                     state;
-
-       /* multicast interface name */
-       char                    mcast_ifn[IP_VS_IFNAME_MAXLEN];
-
-       /* SyncID we belong to */
-       int                     syncid;
-};
-
-#endif /* _IP_VS_H */
index 7ea13394879b07ef9820b3aa9881c26af8bc0364..3750ff907b33d3010174391d66144be0ceba9a6f 100644 (file)
@@ -1,5 +1,5 @@
---- ipvsadm-1.24/Makefile.orig 2004-10-27 17:53:07.000000000 +0200
-+++ ipvsadm-1.24/Makefile      2005-06-06 21:23:52.864458968 +0200
+--- ipvsadm-1.26/Makefile.orig 2004-10-27 17:53:07.000000000 +0200
++++ ipvsadm-1.26/Makefile      2005-06-06 21:23:52.864458968 +0200
 @@ -33,7 +33,7 @@
  ARCH          = $(shell uname -m)
  
  endif
  
  ifneq (,$(POPT_LIB))
-@@ -78,7 +71,7 @@
+@@ -78,7 +71,5 @@
  LIBS          = $(POPT_LIB)
  DEFINES               = -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \
                  -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE)
 -DEFINES               += $(shell if [ ! -f ../ip_vs.h ]; then \
-+DEFINES               += $(shell if [ ! -f ip_vs.h ]; then    \
-                    echo "-DHAVE_NET_IP_VS_H"; fi;)
+-                   echo "-DHAVE_NET_IP_VS_H"; fi;)
  
  
 --- ipvsadm-1.24/libipvs/Makefile.orig 2002-12-19 14:53:07.000000000 +0100
 +++ ipvsadm-1.24/libipvs/Makefile      2005-06-06 21:25:13.995125232 +0200
-@@ -1,14 +1,14 @@
+@@ -1,14 +1,10 @@
  # Makefile for libipvs
  
  CC            = gcc
@@ -62,9 +61,6 @@
 -INCLUDE               += $(shell if [ -f ../../ip_vs.h ]; then        \
 -                   echo "-I../../."; fi;)
 -DEFINES               = $(shell if [ ! -f ../../ip_vs.h ]; then       \
-+INCLUDE               += $(shell if [ -f ../ip_vs.h ]; then   \
-+                   echo "-I.."; fi;)
-+DEFINES               = $(shell if [ ! -f ../ip_vs.h ]; then  \
-                   echo "-DHAVE_NET_IP_VS_H"; fi;)
+-                  echo "-DHAVE_NET_IP_VS_H"; fi;)
  
  .PHONY                = all clean install dist distclean rpm rpms
index 1801f731aa2a1c1163dd9948bb19c654280be0f8..1b50d0de469ae486a9b169d8875e74c861704ab0 100644 (file)
@@ -3,11 +3,10 @@ Summary(pl.UTF-8):    NarzÄ™dzie do administracji wirtualnymi serwerami
 Name:          ipvsadm
 Version:       1.26
 Release:       1
-License:       GPL
+License:       GPL v2+
 Group:         Applications/System
 Source0:       http://www.linuxvirtualserver.org/software/kernel-2.6/%{name}-%{version}.tar.gz
 # Source0-md5: eac3ba3f62cd4dea2da353aeddd353a8
-Source1:       %{name}-ip_vs.h
 Patch0:                %{name}-make.patch
 URL:           http://www.LinuxVirtualServer.org/
 BuildRequires: libnl-devel
@@ -35,8 +34,6 @@ wersje Linuksa 2.6.x.
 %setup -q
 %patch0 -p1
 
-cp -f %{SOURCE1} ip_vs.h
-
 %build
 %{__make} -j1 \
        CC="%{__cc}" \
This page took 0.110852 seconds and 4 git commands to generate.