Ethereal-dev: [ethereal-dev] Some patches

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Craig Rodrigues <rodrigc@xxxxxxxxxxxx>
Date: Wed, 17 Nov 1999 20:26:59 -0500
Hi,

Here are some minor changes I made in my attempts to
get things to compile under AIX.  Just minor things
like removing trailing commas in enums,
and converting bit-fields to guint32.
 
-- 
Craig Rodrigues        
http://www.gis.net/~craigr    
rodrigc@xxxxxxxxxxxx          

*** packet-ipv6.h.old	Wed Nov 17 19:35:37 1999
--- packet-ipv6.h	Wed Nov 17 19:36:18 1999
***************
*** 417,428 ****
  struct icmp6_router_renum {	/* router renumbering header */
  	struct icmp6_hdr	rr_hdr;
  	guint8		rr_segnum;
! 	guint8		rr_test : 1;
! 	guint8		rr_reqresult : 1;
! 	guint8		rr_forceapply : 1;
! 	guint8		rr_specsite : 1;
! 	guint8		rr_prevdone : 1;
! 	guint8		rr_flags_reserved : 3;
  	guint16		rr_maxdelay;
  	guint32		rr_reserved;
  };
--- 417,428 ----
  struct icmp6_router_renum {	/* router renumbering header */
  	struct icmp6_hdr	rr_hdr;
  	guint8		rr_segnum;
! 	guint32		rr_test : 1;
! 	guint32		rr_reqresult : 1;
! 	guint32		rr_forceapply : 1;
! 	guint32		rr_specsite : 1;
! 	guint32		rr_prevdone : 1;
! 	guint32		rr_flags_reserved : 3;
  	guint16		rr_maxdelay;
  	guint32		rr_reserved;
  };
***************
*** 430,441 ****
  struct icmp6_router_renum {	/* router renumbering header */
  	struct icmp6_hdr	rr_hdr;
  	guint8		rr_segnum;
! 	guint8		rr_flags_reserved : 3;
! 	guint8		rr_prevdone : 1;
! 	guint8		rr_specsite : 1;
! 	guint8		rr_forceapply : 1;
! 	guint8		rr_reqresult : 1;
! 	guint8		rr_test : 1;
  	guint16		rr_maxdelay;
  	guint32		rr_reserved;
  };
--- 430,441 ----
  struct icmp6_router_renum {	/* router renumbering header */
  	struct icmp6_hdr	rr_hdr;
  	guint8		rr_segnum;
! 	guint32		rr_flags_reserved : 3;
! 	guint32		rr_prevdone : 1;
! 	guint32		rr_specsite : 1;
! 	guint32		rr_forceapply : 1;
! 	guint32		rr_reqresult : 1;
! 	guint32		rr_test : 1;
  	guint16		rr_maxdelay;
  	guint32		rr_reserved;
  };
***************
*** 466,477 ****
  struct rr_pco_use {		/* use prefix part */
  	guint8	rpu_uselen;
  	guint8	rpu_keeplen;
! 	guint8	rpu_mask_onlink : 1;
! 	guint8	rpu_mask_autonomous : 1;
! 	guint8	rpu_mask_reserved : 6;
! 	guint8	rpu_onlink : 1;
! 	guint8	rpu_autonomous : 1;
! 	guint8	rpu_raflags_reserved : 6;
  	guint32	rpu_vltime;
  	guint32	rpu_pltime;
  	guint32	rpu_decr_vltime : 1;
--- 466,477 ----
  struct rr_pco_use {		/* use prefix part */
  	guint8	rpu_uselen;
  	guint8	rpu_keeplen;
! 	guint32	rpu_mask_onlink : 1;
! 	guint32	rpu_mask_autonomous : 1;
! 	guint32	rpu_mask_reserved : 6;
! 	guint32	rpu_onlink : 1;
! 	guint32	rpu_autonomous : 1;
! 	guint32	rpu_raflags_reserved : 6;
  	guint32	rpu_vltime;
  	guint32	rpu_pltime;
  	guint32	rpu_decr_vltime : 1;
***************
*** 484,495 ****
  struct rr_pco_use {		/* use prefix part */
  	guint8	rpu_uselen;
  	guint8	rpu_keeplen;
! 	guint8	rpu_mask_reserved : 6;
! 	guint8	rpu_mask_autonomous : 1;
! 	guint8	rpu_mask_onlink : 1;
! 	guint8	rpu_raflags_reserved : 6;
! 	guint8	rpu_autonomous : 1;
! 	guint8	rpu_onlink : 1;
  	guint32	rpu_vltime;
  	guint32	rpu_pltime;
  	guint32	rpu_flags_reserved : 6;
--- 484,495 ----
  struct rr_pco_use {		/* use prefix part */
  	guint8	rpu_uselen;
  	guint8	rpu_keeplen;
! 	guint32	rpu_mask_reserved : 6;
! 	guint32	rpu_mask_autonomous : 1;
! 	guint32	rpu_mask_onlink : 1;
! 	guint32	rpu_raflags_reserved : 6;
! 	guint32	rpu_autonomous : 1;
! 	guint32	rpu_onlink : 1;
  	guint32	rpu_vltime;
  	guint32	rpu_pltime;
  	guint32	rpu_flags_reserved : 6;
***************
*** 503,511 ****
  #if BYTE_ORDER == BIG_ENDIAN /* net byte order */
  struct rr_result {		/* router renumbering result message */
  	guint8	rrr_reserved;
! 	guint8	rrr_flags_reserved : 6;
! 	guint8	rrr_outofbound : 1;
! 	guint8	rrr_forbidden : 1;
  	guint8	rrr_ordinal;
  	guint8	rrr_matchedlen;
  	guint32	rrr_ifid;
--- 503,511 ----
  #if BYTE_ORDER == BIG_ENDIAN /* net byte order */
  struct rr_result {		/* router renumbering result message */
  	guint8	rrr_reserved;
! 	guint32	rrr_flags_reserved : 6;
! 	guint32	rrr_outofbound : 1;
! 	guint32	rrr_forbidden : 1;
  	guint8	rrr_ordinal;
  	guint8	rrr_matchedlen;
  	guint32	rrr_ifid;
***************
*** 514,522 ****
  #elif BYTE_ORDER == LITTLE_ENDIAN
  struct rr_result {		/* router renumbering result message */
  	guint8	rrr_reserved;
! 	guint8	rrr_forbidden : 1;
! 	guint8	rrr_outofbound : 1;
! 	guint8	rrr_flags_reserved : 6;
  	guint8	rrr_ordinal;
  	guint8	rrr_matchedlen;
  	guint32	rrr_ifid;
--- 514,522 ----
  #elif BYTE_ORDER == LITTLE_ENDIAN
  struct rr_result {		/* router renumbering result message */
  	guint8	rrr_reserved;
! 	guint32	rrr_forbidden : 1;
! 	guint32	rrr_outofbound : 1;
! 	guint32	rrr_flags_reserved : 6;
  	guint8	rrr_ordinal;
  	guint8	rrr_matchedlen;
  	guint32	rrr_ifid;
*** packet-ncp.c.old	Wed Nov 17 19:40:03 1999
--- packet-ncp.c	Wed Nov 17 19:41:00 1999
***************
*** 158,164 ****
  		NCP_QUEUE_SERVICES,		/* print queues */
  		NCP_FILE_SERVICES,		/* file serving */
  		NCP_BINDERY_SERVICES,	/* bindery database */
! 		NCP_CONNECTION_SERVICES, /* communication */
  };
  
  /* I had to put this function prototype after the enum nfamily declaration */
--- 158,164 ----
  		NCP_QUEUE_SERVICES,		/* print queues */
  		NCP_FILE_SERVICES,		/* file serving */
  		NCP_BINDERY_SERVICES,	/* bindery database */
! 		NCP_CONNECTION_SERVICES /* communication */
  };
  
  /* I had to put this function prototype after the enum nfamily declaration */
*** packet-rsvp.h.old	Wed Nov 17 19:42:46 1999
--- packet-rsvp.h	Wed Nov 17 19:43:36 1999
***************
*** 53,59 ****
      RSVP_CLASS_SENDER_TSPEC,
      RSVP_CLASS_ADSPEC,
      RSVP_CLASS_POLICY,
!     RSVP_CLASS_CONFIRM,
  };
  
  static value_string rsvp_class_vals[] = { 
--- 53,59 ----
      RSVP_CLASS_SENDER_TSPEC,
      RSVP_CLASS_ADSPEC,
      RSVP_CLASS_POLICY,
!     RSVP_CLASS_CONFIRM
  };
  
  static value_string rsvp_class_vals[] = { 
***************
*** 297,303 ****
      QOS_QUALITATIVE =     128,          /* Qualitative service */
      QOS_CONTROLLED_LOAD=    5,		/* Controlled Load Service */
      QOS_GUARANTEED =        2,		/* Guaranteed service */
!     QOS_TSPEC =             1,		/* Traffic specification */
      };
  
  static value_string qos_vals[] = {
--- 297,303 ----
      QOS_QUALITATIVE =     128,          /* Qualitative service */
      QOS_CONTROLLED_LOAD=    5,		/* Controlled Load Service */
      QOS_GUARANTEED =        2,		/* Guaranteed service */
!     QOS_TSPEC =             1		/* Traffic specification */
      };
  
  static value_string qos_vals[] = {
***************
*** 319,325 ****
  	INTSRV_GENERAL = 1,
  	INTSRV_GTD = 2,
  	INTSRV_CLOAD = 5,
! 	INTSRV_QUALITATIVE = 128,
  };
  
  static value_string intsrv_services_str[] = { 
--- 319,325 ----
  	INTSRV_GENERAL = 1,
  	INTSRV_GTD = 2,
  	INTSRV_CLOAD = 5,
! 	INTSRV_QUALITATIVE = 128
  };
  
  static value_string intsrv_services_str[] = { 
*** packet-smb.c.old	Wed Nov 17 19:45:07 1999
--- packet-smb.c	Wed Nov 17 19:46:00 1999
***************
*** 9934,9939 ****
--- 9934,9940 ----
        break;
  
      default:
+       break;
      }
  
      return 1;  /* Success */