Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Side by Side Diff: net/socket/ssl_client_socket_mac.cc

Issue 8831001: base::Bind: Convert Socket::Write. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix alignment. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_mac.h ('k') | net/socket/ssl_client_socket_nss.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/ssl_client_socket_mac.h" 5 #include "net/socket/ssl_client_socket_mac.h"
6 6
7 #include <CoreServices/CoreServices.h> 7 #include <CoreServices/CoreServices.h>
8 #include <netdb.h> 8 #include <netdb.h>
9 #include <sys/socket.h> 9 #include <sys/socket.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 const SSLClientSocketContext& context) 526 const SSLClientSocketContext& context)
527 : transport_read_callback_(this, 527 : transport_read_callback_(this,
528 &SSLClientSocketMac::OnTransportReadComplete), 528 &SSLClientSocketMac::OnTransportReadComplete),
529 transport_write_callback_(this, 529 transport_write_callback_(this,
530 &SSLClientSocketMac::OnTransportWriteComplete), 530 &SSLClientSocketMac::OnTransportWriteComplete),
531 transport_(transport_socket), 531 transport_(transport_socket),
532 host_and_port_(host_and_port), 532 host_and_port_(host_and_port),
533 ssl_config_(ssl_config), 533 ssl_config_(ssl_config),
534 old_user_connect_callback_(NULL), 534 old_user_connect_callback_(NULL),
535 old_user_read_callback_(NULL), 535 old_user_read_callback_(NULL),
536 user_write_callback_(NULL), 536 old_user_write_callback_(NULL),
537 user_read_buf_len_(0), 537 user_read_buf_len_(0),
538 user_write_buf_len_(0), 538 user_write_buf_len_(0),
539 next_handshake_state_(STATE_NONE), 539 next_handshake_state_(STATE_NONE),
540 cert_verifier_(context.cert_verifier), 540 cert_verifier_(context.cert_verifier),
541 renegotiating_(false), 541 renegotiating_(false),
542 client_cert_requested_(false), 542 client_cert_requested_(false),
543 ssl_context_(NULL), 543 ssl_context_(NULL),
544 bytes_read_after_renegotiation_(0), 544 bytes_read_after_renegotiation_(0),
545 pending_send_error_(OK), 545 pending_send_error_(OK),
546 net_log_(transport_socket->socket()->NetLog()) { 546 net_log_(transport_socket->socket()->NetLog()) {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 } else { 730 } else {
731 user_read_buf_ = NULL; 731 user_read_buf_ = NULL;
732 user_read_buf_len_ = 0; 732 user_read_buf_len_ = 0;
733 } 733 }
734 return rv; 734 return rv;
735 } 735 }
736 736
737 int SSLClientSocketMac::Write(IOBuffer* buf, int buf_len, 737 int SSLClientSocketMac::Write(IOBuffer* buf, int buf_len,
738 OldCompletionCallback* callback) { 738 OldCompletionCallback* callback) {
739 DCHECK(completed_handshake()); 739 DCHECK(completed_handshake());
740 DCHECK(!user_write_callback_); 740 DCHECK(!old_user_write_callback_ && user_write_callback_.is_null());
741 DCHECK(!user_write_buf_); 741 DCHECK(!user_write_buf_);
742 742
743 user_write_buf_ = buf; 743 user_write_buf_ = buf;
744 user_write_buf_len_ = buf_len;
745
746 int rv = DoPayloadWrite();
747 if (rv == ERR_IO_PENDING) {
748 old_user_write_callback_ = callback;
749 } else {
750 user_write_buf_ = NULL;
751 user_write_buf_len_ = 0;
752 }
753 return rv;
754 }
755 int SSLClientSocketMac::Write(IOBuffer* buf, int buf_len,
756 const CompletionCallback& callback) {
757 DCHECK(completed_handshake());
758 DCHECK(!old_user_write_callback_ && user_write_callback_.is_null());
759 DCHECK(!user_write_buf_);
760
761 user_write_buf_ = buf;
744 user_write_buf_len_ = buf_len; 762 user_write_buf_len_ = buf_len;
745 763
746 int rv = DoPayloadWrite(); 764 int rv = DoPayloadWrite();
747 if (rv == ERR_IO_PENDING) { 765 if (rv == ERR_IO_PENDING) {
748 user_write_callback_ = callback; 766 user_write_callback_ = callback;
749 } else { 767 } else {
750 user_write_buf_ = NULL; 768 user_write_buf_ = NULL;
751 user_write_buf_len_ = 0; 769 user_write_buf_len_ = 0;
752 } 770 }
753 return rv; 771 return rv;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 CompletionCallback c = user_read_callback_; 983 CompletionCallback c = user_read_callback_;
966 user_read_callback_.Reset(); 984 user_read_callback_.Reset();
967 user_read_buf_ = NULL; 985 user_read_buf_ = NULL;
968 user_read_buf_len_ = 0; 986 user_read_buf_len_ = 0;
969 c.Run(rv); 987 c.Run(rv);
970 } 988 }
971 } 989 }
972 990
973 void SSLClientSocketMac::DoWriteCallback(int rv) { 991 void SSLClientSocketMac::DoWriteCallback(int rv) {
974 DCHECK(rv != ERR_IO_PENDING); 992 DCHECK(rv != ERR_IO_PENDING);
975 DCHECK(user_write_callback_); 993 DCHECK(old_user_write_callback_ && !user_write_callback_.is_null());
976 994
977 // Since Run may result in Write being called, clear user_write_callback_ up 995 // Since Run may result in Write being called, clear user_write_callback_ up
978 // front. 996 // front.
979 OldCompletionCallback* c = user_write_callback_; 997 if (old_user_write_callback_) {
980 user_write_callback_ = NULL; 998 OldCompletionCallback* c = old_user_write_callback_;
981 user_write_buf_ = NULL; 999 old_user_write_callback_ = NULL;
982 user_write_buf_len_ = 0; 1000 user_write_buf_ = NULL;
983 c->Run(rv); 1001 user_write_buf_len_ = 0;
1002 c->Run(rv);
1003 } else {
1004 CompletionCallback c = user_write_callback_;
1005 user_write_callback_.Reset();
1006 user_write_buf_ = NULL;
1007 user_write_buf_len_ = 0;
1008 c.Run(rv);
1009 }
984 } 1010 }
985 1011
986 void SSLClientSocketMac::OnHandshakeIOComplete(int result) { 1012 void SSLClientSocketMac::OnHandshakeIOComplete(int result) {
987 int rv = DoHandshakeLoop(result); 1013 int rv = DoHandshakeLoop(result);
988 if (rv != ERR_IO_PENDING) { 1014 if (rv != ERR_IO_PENDING) {
989 // If there is no connect callback available to call, we are 1015 // If there is no connect callback available to call, we are
990 // renegotiating (which occurs because we are in the middle of a Read 1016 // renegotiating (which occurs because we are in the middle of a Read
991 // when the renegotiation process starts). So we complete the Read 1017 // when the renegotiation process starts). So we complete the Read
992 // here. 1018 // here.
993 if (!old_user_connect_callback_ && user_connect_callback_.is_null()) { 1019 if (!old_user_connect_callback_ && user_connect_callback_.is_null()) {
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 if (rv < 0 && rv != ERR_IO_PENDING) { 1509 if (rv < 0 && rv != ERR_IO_PENDING) {
1484 us->write_io_buf_ = NULL; 1510 us->write_io_buf_ = NULL;
1485 return OSStatusFromNetError(rv); 1511 return OSStatusFromNetError(rv);
1486 } 1512 }
1487 1513
1488 // always lie to our caller 1514 // always lie to our caller
1489 return noErr; 1515 return noErr;
1490 } 1516 }
1491 1517
1492 } // namespace net 1518 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_mac.h ('k') | net/socket/ssl_client_socket_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698