diff options
| author | gthaker <gthaker@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-06 14:20:43 +0000 |
|---|---|---|
| committer | gthaker <gthaker@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-06 14:20:43 +0000 |
| commit | 5556b70c487a66ca5e04ad9fa931de552a480202 (patch) | |
| tree | 644221b97b761d51f85ba1c9c8992ce102fe11d4 | |
| parent | e370f7328572df73437dd1980b7ed537e1946c9b (diff) | |
| download | ATCD-5556b70c487a66ca5e04ad9fa931de552a480202.tar.gz | |
ChangeLogTag: Tue Aug 5 15:20:00 UTC 2003 Gautam Thaker <gthaker@atl.lmco.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Connection_Handler.cpp | 10 |
2 files changed, 18 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 88f949d7682..78d5e1b2b84 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Aug 5 15:20:00 UTC 2003 Gautam Thaker <gthaker@atl.lmco.com> + + Please email any questions/comments about this update to + Jason Cohen, jcohen@atl.lmco.com + + * tao/Strategies/SCIOP_Connection_Handler.cpp: + + Changed IPPROTO_IP reference to IPPROTO_SCTP. + Fixed hardcoded SCTP_NODELAY option to allow stock RH9 + to build SCIOP code without implementation support. + Tue Aug 5 17:31:17 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * orbsvcs/IFR_Service/ifr_adding_visitor.cpp: diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 51e905cf1bc..aa54a79b267 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -2,11 +2,15 @@ #if TAO_HAS_SCIOP == 1 +// jcohen@atl.lmco.com: The purpose of this is to allow RH9 to build +// SCIOR Profile support even without a functioning SCTP implementation #ifndef IPPROTO_SCTP -#include "netinet/sctp.h" +# include "netinet/sctp.h" #else // !IPPROTO_SCTP -#define SCTP_NODELAY 1 +# ifndef SCTP_NODELAY +# define SCTP_NODELAY 1 +# endif // !SCTP_NODELAY #endif #include "tao/Timeprobe.h" @@ -394,7 +398,7 @@ TAO_SCIOP_Connection_Handler::set_dscp_codepoint (void) if (tos != this->dscp_codepoint_) { - int ret = this->peer ().set_option (IPPROTO_IP, + int ret = this->peer ().set_option (IPPROTO_SCTP, IP_TOS, (int *) &tos , (int) sizeof (tos)); |