diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-23 20:48:06 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-23 20:48:06 +0000 |
| commit | 0c1d8020ba2e67cfd2035cff6929cd36f6833f95 (patch) | |
| tree | e417ee26372ebbc94a47830f8b265261deb05bc2 | |
| parent | d94def0daec76a4fbf7ae3f7137ab7eacb5b5117 (diff) | |
| download | ATCD-0c1d8020ba2e67cfd2035cff6929cd36f6833f95.tar.gz | |
ChangeLogTag:Wed Apr 23 15:31:23 2003 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | THANKS | 3 | ||||
| -rw-r--r-- | ace/MEM_Acceptor.cpp | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 487d86f9f62..597a487f365 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Apr 23 15:31:23 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/MEM_Acceptor.cpp: Removed the use of len_ptr variable in + accept method as it is not needed it at all for MEM_Acceptor and + the accept were trying to dereference the the null pointer when + resolving the remote address. Thanks to Subhabrata Biswas + <Subhabrata.Biswas@roamware.com> for reporting the problem. + Wed Apr 23 16:10:07 2003 Irfan Pyarali <irfan@oomworks.com> * ace\config-win32-msvc-6.h: @@ -37,7 +45,7 @@ Wed Apr 23 09:40:26 2003 Venkita Subramonian <venkita@cs.wustl.edu> * Kokyu/DSRT_Schedulers.h: Added two new files while restructuring DSRT Scheduler classes. - + * Kokyu/DSRT_Dispatcher_Impl.cpp: * Kokyu/DSRT_Dispatcher_Impl.h: * Kokyu/Kokyu.cpp: @@ -1683,7 +1683,8 @@ David Kinder <david.kinder@sophos.com> Sebastien Lalonde <SLalonde@interstarinc.com> Jia Wan <jiawan@huawei.com> Bertin Colpron <BColpron@interstarinc.com> -Weston Markham <wmarkham@tissueinformatics.com> +Weston Markham <wmarkham@tissueinformatics.com> +Subhabrata Biswas <Subhabrata.Biswas@roamware.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp index 2fdd889f043..03676c52446 100644 --- a/ace/MEM_Acceptor.cpp +++ b/ace/MEM_Acceptor.cpp @@ -79,7 +79,6 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, { ACE_TRACE ("ACE_MEM_Acceptor::accept"); - int *len_ptr = 0; sockaddr *addr = 0; int in_blocking_mode = 1; @@ -90,9 +89,11 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, else { do + // On Win32 the third parameter to <accept> must be a NULL + // pointer if to ignore the client's address. new_stream.set_handle (ACE_OS::accept (this->get_handle (), addr, - len_ptr)); + 0)); while (new_stream.get_handle () == ACE_INVALID_HANDLE && restart != 0 && errno == EINTR @@ -101,7 +102,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (remote_sap != 0) { ACE_INET_Addr temp (ACE_reinterpret_cast (sockaddr_in *, addr), - *len_ptr); + sizeof (sockaddr_in)); remote_sap->set_port_number(temp.get_port_number ()); } } |