| Index: net/third_party/nss/ssl/dtlscon.c
|
| ===================================================================
|
| --- net/third_party/nss/ssl/dtlscon.c (revision 166942)
|
| +++ net/third_party/nss/ssl/dtlscon.c (working copy)
|
| @@ -1,43 +1,11 @@
|
| +/* This Source Code Form is subject to the terms of the Mozilla Public
|
| + * License, v. 2.0. If a copy of the MPL was not distributed with this
|
| + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
| +
|
| /*
|
| * DTLS Protocol
|
| - *
|
| - * ***** BEGIN LICENSE BLOCK *****
|
| - * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
| - *
|
| - * The contents of this file are subject to the Mozilla Public License Version
|
| - * 1.1 (the "License"); you may not use this file except in compliance with
|
| - * the License. You may obtain a copy of the License at
|
| - * http://www.mozilla.org/MPL/
|
| - *
|
| - * Software distributed under the License is distributed on an "AS IS" basis,
|
| - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
| - * for the specific language governing rights and limitations under the
|
| - * License.
|
| - *
|
| - * The Original Code is the Netscape security libraries.
|
| - *
|
| - * The Initial Developer of the Original Code is
|
| - * Netscape Communications Corporation.
|
| - * Portions created by the Initial Developer are Copyright (C) 1994-2000
|
| - * the Initial Developer. All Rights Reserved.
|
| - *
|
| - * Contributor(s):
|
| - * Eric Rescorla <ekr@rtfm.com>
|
| - *
|
| - * Alternatively, the contents of this file may be used under the terms of
|
| - * either the GNU General Public License Version 2 or later (the "GPL"), or
|
| - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
| - * in which case the provisions of the GPL or the LGPL are applicable instead
|
| - * of those above. If you wish to allow use of your version of this file only
|
| - * under the terms of either the GPL or the LGPL, and not to allow others to
|
| - * use your version of this file under the terms of the MPL, indicate your
|
| - * decision by deleting the provisions above and replace them with the notice
|
| - * and other provisions required by the GPL or the LGPL. If you do not delete
|
| - * the provisions above, a recipient may use your version of this file under
|
| - * the terms of any one of the MPL, the GPL or the LGPL.
|
| - *
|
| - * ***** END LICENSE BLOCK ***** */
|
| -/* $Id: $ */
|
| + */
|
| +/* $Id: dtlscon.c,v 1.5 2012/09/28 01:46:45 wtc%google.com Exp $ */
|
|
|
| #include "ssl.h"
|
| #include "sslimpl.h"
|
| @@ -286,7 +254,7 @@
|
|
|
| /* At this point we are advancing our state machine, so
|
| * we can free our last flight of messages */
|
| - dtls_FreeHandshakeMessages(ss->ssl3.hs.lastMessageFlight);
|
| + dtls_FreeHandshakeMessages(&ss->ssl3.hs.lastMessageFlight);
|
| ss->ssl3.hs.recvdHighWater = -1;
|
| dtls_CancelTimer(ss);
|
|
|
| @@ -453,7 +421,7 @@
|
|
|
| /* At this point we are advancing our state machine, so
|
| * we can free our last flight of messages */
|
| - dtls_FreeHandshakeMessages(ss->ssl3.hs.lastMessageFlight);
|
| + dtls_FreeHandshakeMessages(&ss->ssl3.hs.lastMessageFlight);
|
| dtls_CancelTimer(ss);
|
|
|
| /* If there have been no retries this time, reset the
|
| @@ -497,7 +465,7 @@
|
| PORT_SetError(SEC_ERROR_NO_MEMORY);
|
| rv = SECFailure;
|
| } else {
|
| - PR_APPEND_LINK(&msg->link, ss->ssl3.hs.lastMessageFlight);
|
| + PR_APPEND_LINK(&msg->link, &ss->ssl3.hs.lastMessageFlight);
|
| }
|
|
|
| return rv;
|
| @@ -623,8 +591,8 @@
|
| * stuffed something in ss->pendingBuf
|
| */
|
| PORT_Assert(!ss->pendingBuf.len);
|
| - for (msg_p = PR_LIST_HEAD(ss->ssl3.hs.lastMessageFlight);
|
| - msg_p != ss->ssl3.hs.lastMessageFlight;
|
| + for (msg_p = PR_LIST_HEAD(&ss->ssl3.hs.lastMessageFlight);
|
| + msg_p != &ss->ssl3.hs.lastMessageFlight;
|
| msg_p = PR_NEXT_LINK(msg_p)) {
|
| DTLSQueuedMessage *msg = (DTLSQueuedMessage *)msg_p;
|
|
|
|
|