Index: EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/ip_igmp.h
===================================================================
--- EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/ip_igmp.h	(revision 331)
+++ EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/ip_igmp.h	(revision 429)
@@ -5,31 +5,39 @@
  *                   Tomakomai National College of Technology, JAPAN
  *
- *  ãLì ÒÍCÈºÌ (1)`(4) Ìð©CFree Software Foundation
- *  ÉæÁÄö\³êÄ¢é GNU General Public License Ì Version 2 ÉL
- *  q³êÄ¢éðð½·êÉÀèC{\tgEFAi{\tgEFA
- *  ðüÏµ½àÌðÜÞDÈº¯¶jðgpE¡»EüÏEÄzziÈºC
- *  pÆÄÔj·é±Æð³Åø·éD
- *  (1) {\tgEFAð\[XR[hÌ`Åp·éêÉÍCãLÌì
- *       \¦C±Ìpð¨æÑºLÌ³ÛØKèªC»ÌÜÜÌ`Å\[
- *      XR[hÉÜÜêÄ¢é±ÆD
- *  (2) {\tgEFAðCCu`®ÈÇC¼Ì\tgEFAJ­Ég
- *      pÅ«é`ÅÄzz·éêÉÍCÄzzÉº¤hL
-gip
- *      Ò}j
-AÈÇjÉCãLÌì \¦C±Ìpð¨æÑºL
- *      Ì³ÛØKèðfÚ·é±ÆD
- *  (3) {\tgEFAðC@íÉgÝÞÈÇC¼Ì\tgEFAJ­Ég
- *      pÅ«È¢`ÅÄzz·éêÉÍCÌðð½·±ÆD
- *    (a) ÄzzÉº¤hL
-gipÒ}j
-AÈÇjÉCãLÌ
- *        ì \¦C±Ìpð¨æÑºLÌ³ÛØKèðfÚ·é±ÆD
- *  (4) {\tgEFAÌpÉæè¼ÚIÜ½ÍÔÚIÉ¶¶é¢©Èé¹
- *      Q©çàCãLì Ò¨æÑTOPPERSvWFNgðÆÓ·é±ÆD
+ *  ä¸è¨èä½æ¨©è
+ã¯ï¼ä»¥ä¸ã® (1)ï½(4) ã®æ¡ä»¶ãï¼Free Software Foundation
+ *  ã«ãã£ã¦å
+¬è¡¨ããã¦ãã GNU General Public License ã® Version 2 ã«è¨
+ *  è¿°ããã¦ããæ¡ä»¶ãæºããå ´åã«éãï¼æ¬ã½ããã¦ã§ã¢ï¼æ¬ã½ããã¦ã§ã¢
+ *  ãæ¹å¤ãããã®ãå«ãï¼ä»¥ä¸åãï¼ãä½¿ç¨ã»è¤è£½ã»æ¹å¤ã»åé
+å¸ï¼ä»¥ä¸ï¼
+ *  å©ç¨ã¨å¼ã¶ï¼ãããã¨ãç¡åã§è¨±è«¾ããï¼
+ *  (1) æ¬ã½ããã¦ã§ã¢ãã½ã¼ã¹ã³ã¼ãã®å½¢ã§å©ç¨ããå ´åã«ã¯ï¼ä¸è¨ã®èä½
+ *      æ¨©è¡¨ç¤ºï¼ãã®å©ç¨æ¡ä»¶ããã³ä¸è¨ã®ç¡ä¿è¨¼è¦å®ãï¼ãã®ã¾ã¾ã®å½¢ã§ã½ã¼
+ *      ã¹ã³ã¼ãä¸­ã«å«ã¾ãã¦ãããã¨ï¼
+ *  (2) æ¬ã½ããã¦ã§ã¢ãï¼ã©ã¤ãã©ãªå½¢å¼ãªã©ï¼ä»ã®ã½ããã¦ã§ã¢éçºã«ä½¿
+ *      ç¨ã§ããå½¢ã§åé
+å¸ããå ´åã«ã¯ï¼åé
+å¸ã«ä¼´ããã­ã¥ã¡ã³ãï¼å©ç¨
+ *      è
+ããã¥ã¢ã«ãªã©ï¼ã«ï¼ä¸è¨ã®èä½æ¨©è¡¨ç¤ºï¼ãã®å©ç¨æ¡ä»¶ããã³ä¸è¨
+ *      ã®ç¡ä¿è¨¼è¦å®ãæ²è¼ãããã¨ï¼
+ *  (3) æ¬ã½ããã¦ã§ã¢ãï¼æ©å¨ã«çµã¿è¾¼ããªã©ï¼ä»ã®ã½ããã¦ã§ã¢éçºã«ä½¿
+ *      ç¨ã§ããªãå½¢ã§åé
+å¸ããå ´åã«ã¯ï¼æ¬¡ã®æ¡ä»¶ãæºãããã¨ï¼
+ *    (a) åé
+å¸ã«ä¼´ããã­ã¥ã¡ã³ãï¼å©ç¨è
+ããã¥ã¢ã«ãªã©ï¼ã«ï¼ä¸è¨ã®è
+ *        ä½æ¨©è¡¨ç¤ºï¼ãã®å©ç¨æ¡ä»¶ããã³ä¸è¨ã®ç¡ä¿è¨¼è¦å®ãæ²è¼ãããã¨ï¼
+ *  (4) æ¬ã½ããã¦ã§ã¢ã®å©ç¨ã«ããç´æ¥çã¾ãã¯éæ¥çã«çãããããªãæ
+ *      å®³ãããï¼ä¸è¨èä½æ¨©è
+ããã³TOPPERSãã­ã¸ã§ã¯ããå
+è²¬ãããã¨ï¼
  *
- *  {\tgEFAÍC³ÛØÅñ³êÄ¢éàÌÅ éDãLì Ò¨
- *  æÑTOPPERSvWFNgÍC{\tgEFAÉÖµÄC»ÌKpÂ\«à
- *  ÜßÄC¢©ÈéÛØàsíÈ¢DÜ½C{\tgEFAÌpÉæè¼
- *  ÚIÜ½ÍÔÚIÉ¶¶½¢©Èé¹QÉÖµÄàC»ÌÓCðíÈ¢D
+ *  æ¬ã½ããã¦ã§ã¢ã¯ï¼ç¡ä¿è¨¼ã§æä¾ããã¦ãããã®ã§ããï¼ä¸è¨èä½æ¨©è
+ã
+ *  ãã³TOPPERSãã­ã¸ã§ã¯ãã¯ï¼æ¬ã½ããã¦ã§ã¢ã«é¢ãã¦ï¼ãã®é©ç¨å¯è½æ§ã
+ *  å«ãã¦ï¼ãããªãä¿è¨¼ãè¡ããªãï¼ã¾ãï¼æ¬ã½ããã¦ã§ã¢ã®å©ç¨ã«ããç´
+ *  æ¥çã¾ãã¯éæ¥çã«çãããããªãæå®³ã«é¢ãã¦ãï¼ãã®è²¬ä»»ãè² ããªãï¼
  *
  *  @(#) $Id$
@@ -39,77 +47,65 @@
 #define _IP_IGMP_H_
 
-#define NUM_IGMP_ENTRY				5	/* }`LXgO[vÌGg */
-
-#ifdef __CA850__
-#pragma pack(1)
-#elif __RX
-#pragma pack
-#elif _MSC_VER
-#pragma pack(push, 1)
-#endif
+#define NUM_IGMP_ENTRY				5	/* ãã«ãã­ã£ã¹ãã°ã«ã¼ãã®ã¨ã³ããªæ° */
 
  /*
-  *  IGMPv1 wb_Ìè`ARFC 1112
+  *  IGMPv1 ãããã®å®ç¾©ãRFC 1112
   */
 
 typedef struct t_igmpv1_hdr
 {
-	uint8_t		type;		/* bZ[WÌ^	*/
-	uint8_t		unused;		/* ¢gp			*/
-	uint16_t	sum;		/* `FbNT		*/
-	T_IN4_ADDR	addr;		/* O[vAhX */
-} T_IGMPV1_HDR;
+	uint8_t		type;		/* ã¡ãã»ã¼ã¸ã®å	*/
+	uint8_t		unused;		/* æªä½¿ç¨			*/
+	uint16_t	sum;		/* ãã§ãã¯ãµã 		*/
+	T_IN4_ADDR	addr;		/* ã°ã«ã¼ãã¢ãã¬ã¹ */
+}  __attribute__((packed)) T_IGMPV1_HDR;
 
 /*
-*  IGMPv2 wb_Ìè`ARFC 2236
+*  IGMPv2 ãããã®å®ç¾©ãRFC 2236
 */
 
 typedef struct t_igmpv2_hdr
 {
-	uint8_t		type;		/* bZ[WÌ^	*/
-	uint8_t		time;		/* ÅåÔ		*/
-	uint16_t	sum;		/* `FbNT		*/
-	T_IN4_ADDR	addr;		/* O[vAhX */
-} T_IGMPV2_HDR;
+	uint8_t		type;		/* ã¡ãã»ã¼ã¸ã®å	*/
+	uint8_t		time;		/* æå¤§å¿ç­æé		*/
+	uint16_t	sum;		/* ãã§ãã¯ãµã 		*/
+	T_IN4_ADDR	addr;		/* ã°ã«ã¼ãã¢ãã¬ã¹ */
+}  __attribute__((packed)) T_IGMPV2_HDR;
 
 typedef struct t_igmpv3_query_hdr
 {
-	uint8_t		type;		/* bZ[WÌ^	*/
-	uint8_t		time;		/* ÅåÔ		*/
-	uint16_t	sum;		/* `FbNT		*/
-	T_IN4_ADDR	grpaddr;	/* O[vAhX */
-	uint8_t		sqrv;		/* StOAQuerier Robustness Value */
+	uint8_t		type;		/* ã¡ãã»ã¼ã¸ã®å	*/
+	uint8_t		time;		/* æå¤§å¿ç­æé		*/
+	uint16_t	sum;		/* ãã§ãã¯ãµã 		*/
+	T_IN4_ADDR	grpaddr;	/* ã°ã«ã¼ãã¢ãã¬ã¹ */
+	uint8_t		sqrv;		/* Sãã©ã°ãQuerier Robustness Value */
 	uint8_t		qqic;		/* Qurier's Query Interval Code */
-	uint16_t	num;		/* M³Ì */
-	T_IN4_ADDR	sdraddr;	/* M³AhX */
-} T_IGMPV3Q_HDR;
+	uint16_t	num;		/* éä¿¡å
+ã®æ° */
+	T_IN4_ADDR	sdraddr;	/* éä¿¡å
+ã¢ãã¬ã¹ */
+}  __attribute__((packed)) T_IGMPV3Q_HDR;
 
 typedef struct t_igmp_group_record
 {
-	uint8_t		type;		/* bZ[WÌ^	*/
-	uint8_t		len;		/* âf[^·		*/
-	uint16_t	num;		/* M³Ì */
-	T_IN4_ADDR	grpaddr;	/* O[vAhX */
-	T_IN4_ADDR	sdraddr;	/* M³AhX	*/
-							/* âf[^		*/
-} T_IGMP_GROUP_RECORD;
+	uint8_t		type;		/* ã¡ãã»ã¼ã¸ã®å	*/
+	uint8_t		len;		/* è£å©ãã¼ã¿é·		*/
+	uint16_t	num;		/* éä¿¡å
+ã®æ° */
+	T_IN4_ADDR	grpaddr;	/* ã°ã«ã¼ãã¢ãã¬ã¹ */
+	T_IN4_ADDR	sdraddr;	/* éä¿¡å
+ã¢ãã¬ã¹	*/
+							/* è£å©ãã¼ã¿		*/
+}  __attribute__((packed)) T_IGMP_GROUP_RECORD;
 
 typedef struct t_igmpv3_report_hdr
 {
-	uint8_t		type;		/* bZ[WÌ^	*/
-	uint8_t		rsv1;		/* \ñ				*/
-	uint16_t	sum;		/* `FbNT		*/
-	uint16_t	rsv2;		/* \ñ				*/
-	uint16_t	num;		/* O[vR[hÌ */
-	T_IGMP_GROUP_RECORD record;	/* O[vR[h */
-} T_IGMPV3R_HDR;
-
-#ifdef __CA850__
-#pragma pack(8)
-#elif __RX
-#pragma unpack
-#elif _MSC_VER
-#pragma pack(pop)
-#endif
+	uint8_t		type;		/* ã¡ãã»ã¼ã¸ã®å	*/
+	uint8_t		rsv1;		/* äºç´				*/
+	uint16_t	sum;		/* ãã§ãã¯ãµã 		*/
+	uint16_t	rsv2;		/* äºç´				*/
+	uint16_t	num;		/* ã°ã«ã¼ãã¬ã³ã¼ãã®æ° */
+	T_IGMP_GROUP_RECORD record;	/* ã°ã«ã¼ãã¬ã³ã¼ã */
+}  __attribute__((packed)) T_IGMPV3R_HDR;
 
 #define IGMP_HDR_SIZE			(sizeof(T_IGMPV1_HDR))
@@ -125,15 +121,15 @@
 
 /*
-*  bZ[WÌ^
+*  ã¡ãã»ã¼ã¸ã®å
 */
 
-#define IGMP_MEMBERSHIP_QUERY		0x11	/* o[VbvNG[		*/
-#define IGMP_MEMBERSHIP_REPORT		0x12	/* o[Vbv|[g		*/
-#define IGMP_MEMBERSHIP_REPORT_V2	0x16	/* o[Vbv|[g		*/
-#define IGMP_LEAVE_GROUP			0x17	/* [uO[v				*/
-#define IGMP_MEMBERSHIP_REPORT_V3	0x22	/* o[Vbv|[g		*/
+#define IGMP_MEMBERSHIP_QUERY		0x11	/* ã¡ã³ãã¼ã·ããã¯ã¨ãªã¼		*/
+#define IGMP_MEMBERSHIP_REPORT		0x12	/* ã¡ã³ãã¼ã·ããã¬ãã¼ã		*/
+#define IGMP_MEMBERSHIP_REPORT_V2	0x16	/* ã¡ã³ãã¼ã·ããã¬ãã¼ã		*/
+#define IGMP_LEAVE_GROUP			0x17	/* ãªã¼ãã°ã«ã¼ã				*/
+#define IGMP_MEMBERSHIP_REPORT_V3	0x22	/* ã¡ã³ãã¼ã·ããã¬ãã¼ã		*/
 
 /*
-*  UDPÊM[_IvV
+*  UDPéä¿¡ç«¯ç¹ãªãã·ã§ã³
 */
 
@@ -168,12 +164,12 @@
 
 /*
- *  IGMP O[vGg
+ *  IGMP ã°ã«ã¼ãã¨ã³ããª
  */
 
 typedef struct igmp_entry
 {
-	uint16_t	timer;		/* MÜÅÌÔ[b]	*/
-	uint16_t	resptime;	/* ÅåÔ[b]	*/
-	T_IN4_ADDR	ip_addr;	/* IP AhX			*/
+	int16_t		timer;		/* éä¿¡ã¾ã§ã®æé[ç§]	*/
+	int16_t		resptime;	/* æå¤§å¿ç­æé[ç§]	*/
+	T_IN4_ADDR	ip_addr;	/* IP ã¢ãã¬ã¹			*/
 } T_IGMP_ENTRY;
 
