소스 검색

* moves MSG_* constants from socketsh.inc to platform specific unxsockh.inc and fixes them for freebsd/darwin and solaris (linux ones were used before, not right)

git-svn-id: trunk@4646 -
Almindor 19 년 전
부모
커밋
d4e1612fd1
5개의 변경된 파일65개의 추가작업 그리고 22개의 파일을 삭제
  1. 16 0
      rtl/darwin/unxsockh.inc
  2. 16 0
      rtl/freebsd/unxsockh.inc
  3. 0 20
      rtl/inc/socketsh.inc
  4. 21 0
      rtl/linux/unxsockh.inc
  5. 12 2
      rtl/solaris/unxsockh.inc

+ 16 - 0
rtl/darwin/unxsockh.inc

@@ -222,3 +222,19 @@ Const
       	IP_MULTICAST_LOOP	= 11;   { u_char; set/get IP multicast loopback }
       	IP_ADD_MEMBERSHIP	= 12;   { ip_mreq; add an IP group membership }
       	IP_DROP_MEMBERSHIP	= 13;   { ip_mreq; drop an IP group membership }
+       
+  { Flags for send, recv etc. }
+  MSG_OOB       = $0001;              { Process out-of-band data}
+  MSG_PEEK      = $0002;              { Peek at incoming messages }
+  MSG_DONTROUTE = $0004;              { Don't use local routing }
+  MSG_EOR       = $0008;              { End of record }
+  MSG_TRUNC     = $0010;
+  MSG_CTRUNC    = $0020;              { Control data lost before delivery }
+  MSG_WAITALL   = $0040;              { Wait for a full request }
+  MSG_DONTWAIT  = $0080;              { Non-blocking I/O }
+  MSG_EOF       = $0100;
+  MSG_NBIO      = $4000;
+  MSG_COMPAT    = $8000;
+  MSG_SOCALLBCK = $10000;
+  MSG_NOSIGNAL  = $20000;              { Do not generate SIGPIPE }
+

+ 16 - 0
rtl/freebsd/unxsockh.inc

@@ -255,3 +255,19 @@ Const
  	IPV6_DSTOPTS            = 50; { ip6_dest; send dst option befor rthdr }
  	IPV6_RTHDR              = 51; { ip6_rthdr; send routing header }
  	IPV6_PKTOPTIONS         = 52; { buf/cmsghdr; set/get IPv6 options }
+  
+  { Flags for send, recv etc. }
+  MSG_OOB       = $0001;              { Process out-of-band data}
+  MSG_PEEK      = $0002;              { Peek at incoming messages }
+  MSG_DONTROUTE = $0004;              { Don't use local routing }
+  MSG_EOR       = $0008;              { End of record }
+  MSG_TRUNC     = $0010;
+  MSG_CTRUNC    = $0020;              { Control data lost before delivery }
+  MSG_WAITALL   = $0040;              { Wait for a full request }
+  MSG_DONTWAIT  = $0080;              { Non-blocking I/O }
+  MSG_EOF       = $0100;
+  MSG_NBIO      = $4000;
+  MSG_COMPAT    = $8000;
+  MSG_SOCALLBCK = $10000;
+  MSG_NOSIGNAL  = $20000;              { Do not generate SIGPIPE }
+

+ 0 - 20
rtl/inc/socketsh.inc

@@ -51,26 +51,6 @@ const
   AF_FILE      = PF_FILE;
   AF_INET      = PF_INET;
 
-  { Flags for send, recv etc. }
-  MSG_OOB      = $0001;              { Process out-of-band data}
-  MSG_PEEK     = $0002;              { Peek at incoming messages }
-  MSG_DONTROUTE= $0004;              { Don't use local routing }
-  MSG_TRYHARD  = MSG_DONTROUTE;
-  MSG_CTRUNC   = $0008;              { Control data lost before delivery }
-  MSG_PROXY    = $0010;              { Supply or ask second address }
-  MSG_TRUNC    = $0020;
-  MSG_DONTWAIT = $0040;              { Non-blocking I/O }
-  MSG_EOR      = $0080;              { End of record }
-  MSG_WAITALL  = $0100;              { Wait for a full request }
-  MSG_FIN      = $0200;
-  MSG_SYN      = $0400;
-  MSG_CONFIRM  = $0800;              { Confirm path validity }
-  MSG_RST      = $1000;
-  MSG_ERRQUERE = $2000;              { Fetch message from error queue }
-  MSG_NOSIGNAL = $4000;              { Do not generate SIGPIPE }
-  MSG_MORE     = $8000;              { Sender will send more }
-  MSG_EOF      = MSG_FIN;
-
   INADDR_ANY   = CARDINAL(0);
   INADDR_NONE  = CARDINAL($FFFFFFFF);
 

+ 21 - 0
rtl/linux/unxsockh.inc

@@ -286,3 +286,24 @@ Const
         IPV6_RTHDR_STRICT     = 1;    { Hop must be a neighbour.  }
 
         IPV6_RTHDR_TYPE_0        = 0;    { IPv6 Routing header type 0.  }
+        
+  { Flags for send, recv etc. }
+  MSG_OOB      = $0001;              { Process out-of-band data}
+  MSG_PEEK     = $0002;              { Peek at incoming messages }
+  MSG_DONTROUTE= $0004;              { Don't use local routing }
+  MSG_TRYHARD  = MSG_DONTROUTE;
+  MSG_CTRUNC   = $0008;              { Control data lost before delivery }
+  MSG_PROXY    = $0010;              { Supply or ask second address }
+  MSG_TRUNC    = $0020;
+  MSG_DONTWAIT = $0040;              { Non-blocking I/O }
+  MSG_EOR      = $0080;              { End of record }
+  MSG_WAITALL  = $0100;              { Wait for a full request }
+  MSG_FIN      = $0200;
+  MSG_SYN      = $0400;
+  MSG_CONFIRM  = $0800;              { Confirm path validity }
+  MSG_RST      = $1000;
+  MSG_ERRQUERE = $2000;              { Fetch message from error queue }
+  MSG_NOSIGNAL = $4000;              { Do not generate SIGPIPE }
+  MSG_MORE     = $8000;              { Sender will send more }
+  MSG_EOF      = MSG_FIN;
+

+ 12 - 2
rtl/solaris/unxsockh.inc

@@ -112,6 +112,16 @@ Const
    SHUT_WR         = 1;             { shut down the writing side }
    SHUT_RDWR       = 2;             { shut down both sides }
 
-
-
+  { Flags for send, recv etc. }
+  MSG_OOB          = $0001;              { Process out-of-band data}
+  MSG_PEEK         = $0002;              { Peek at incoming messages }
+  MSG_DONTROUTE    = $0004;              { Don't use local routing }
+  MSG_EOR          = $0008;              { End of record }
+  MSG_CTRUNC       = $0010;              { Control data lost before delivery }
+  MSG_TRUNC        = $0020;
+  MSG_WAITALL      = $0040;              { Wait for a full request }
+  MSG_DONTWAIT     = $0080;              { Non-blocking I/O }
+  MSG_NOTIFICATION = $0100;           { Notification, not data }
+  MSG_XPG4_2       = $8000;	      { Private: XPG4.2 flag }
+  MSG_MAXIOVLEN    =    16;