git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
leak-checker: Remove because it cannot be made thread-safe.
[sliver-openvswitch.git]
/
lib
/
stream-ssl.c
diff --git
a/lib/stream-ssl.c
b/lib/stream-ssl.c
index
184b3ff
..
c373ca9
100644
(file)
--- a/
lib/stream-ssl.c
+++ b/
lib/stream-ssl.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012
, 2013
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,7
+17,6
@@
#include <config.h>
#include "stream-ssl.h"
#include "dhparams.h"
#include <config.h>
#include "stream-ssl.h"
#include "dhparams.h"
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
@@
-36,7
+35,6
@@
#include "coverage.h"
#include "dynamic-string.h"
#include "entropy.h"
#include "coverage.h"
#include "dynamic-string.h"
#include "entropy.h"
-#include "leak-checker.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "packets.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "packets.h"
@@
-443,7
+441,7
@@
ssl_connect(struct stream *stream)
case STATE_SSL_CONNECTING:
/* Capture the first few bytes of received data so that we can guess
case STATE_SSL_CONNECTING:
/* Capture the first few bytes of received data so that we can guess
- * what kind of funny data we've been sent if SSL negotation fails. */
+ * what kind of funny data we've been sent if SSL negot
i
ation fails. */
if (sslv->n_head <= 0) {
sslv->n_head = recv(sslv->fd, sslv->head, sizeof sslv->head,
MSG_PEEK);
if (sslv->n_head <= 0) {
sslv->n_head = recv(sslv->fd, sslv->head, sizeof sslv->head,
MSG_PEEK);
@@
-599,7
+597,7
@@
ssl_recv(struct stream *stream, void *buffer, size_t n)
ssize_t ret;
/* Behavior of zero-byte SSL_read is poorly defined. */
ssize_t ret;
/* Behavior of zero-byte SSL_read is poorly defined. */
- assert(n > 0);
+
ovs_
assert(n > 0);
old_state = SSL_get_state(sslv->ssl);
ret = SSL_read(sslv->ssl, buffer, n);
old_state = SSL_get_state(sslv->ssl);
ret = SSL_read(sslv->ssl, buffer, n);
@@
-675,7
+673,6
@@
ssl_send(struct stream *stream, const void *buffer, size_t n)
ssl_clear_txbuf(sslv);
return n;
case EAGAIN:
ssl_clear_txbuf(sslv);
return n;
case EAGAIN:
- leak_checker_claim(buffer);
return n;
default:
sslv->txbuf = NULL;
return n;
default:
sslv->txbuf = NULL;
@@
-809,6
+806,7
@@
pssl_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp,
pssl = xmalloc(sizeof *pssl);
pstream_init(&pssl->pstream, &pssl_pstream_class, bound_name);
pssl = xmalloc(sizeof *pssl);
pstream_init(&pssl->pstream, &pssl_pstream_class, bound_name);
+ pstream_set_bound_port(&pssl->pstream, sin.sin_port);
pssl->fd = fd;
*pstreamp = &pssl->pstream;
return 0;
pssl->fd = fd;
*pstreamp = &pssl->pstream;
return 0;
@@
-897,7
+895,7
@@
ssl_init(void)
static int init_status = -1;
if (init_status < 0) {
init_status = do_ssl_init();
static int init_status = -1;
if (init_status < 0) {
init_status = do_ssl_init();
- assert(init_status >= 0);
+
ovs_
assert(init_status >= 0);
}
return init_status;
}
}
return init_status;
}