PERFORCE change 141811 for review

[Rui Paulo]

http://perforce.freebsd.org/chv.cgi?CH=141811

Change 141811 by rpaulo at rpaulo_epsilon on 2008/05/18 17:45:34

	Remove bogus union.

Affected files ...

.. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#2 edit

Differences ...

==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#2 (text+ko) ====

@@ -23,28 +23,19 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#1 $
+ * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#2 $
  */
 
 #include <netinet/in.h>
 
 typedef struct _conn_t {
 	LIST_ENTRY(_conn_t) entries;
-	union {
-		struct in_addr _sv4addr;
-		struct in_addr _dv4addr;
-		struct in6_addr _sv6addr;
-		struct in6_addr _dv6addr;
-	} _addr;
-	
+	struct in_addr sv4addr;
+	struct in_addr dv4addr;
 	unsigned short dport;
 	unsigned short sport;
 	int tcpstate;		/* TCP FSM state */
 	int isv6;
 } conn_t;
 
-#define	sv4addr	_addr._sv4addr
-#define	dv4addr	_addr._dv4addr
-#define sv6addr	_addr._sv6addr
-#define dv6addr	_addr._dv6addr
 LIST_HEAD(chead, _conn_t) chead;