iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Latest changes

Browse source 
- Fix unit test regression: enable them correctly in cmake.
- Simplify connection has interface
This commit is contained in:
Dmitri Tikhonov 2018-02-28 14:25:21 -05:00
parent bfc7bfd842
commit 7fbe101b9c
7 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/liblsquic/lsquic_conn_hash.c
View file

@ -50,7 +50,7 @@ conn_hash_cleanup (struct conn_hash *conn_hash)
struct lsquic_conn *
conn_hash_find (struct conn_hash *conn_hash, lsquic_cid_t cid, unsigned *hashp)
conn_hash_find (struct conn_hash *conn_hash, lsquic_cid_t cid)
{
const unsigned hash = XXH32(&cid, sizeof(cid), (uintptr_t) conn_hash);
const unsigned buckno = conn_hash_bucket_no(conn_hash, hash);
@ -58,8 +58,6 @@ conn_hash_find (struct conn_hash *conn_hash, lsquic_cid_t cid, unsigned *hashp)
TAILQ_FOREACH(lconn, &conn_hash->ch_buckets[buckno], cn_next_hash)
if (lconn->cn_cid == cid)
return lconn;
if (hashp)
*hashp = hash;
return NULL;
}
@ -103,11 +101,10 @@ double_conn_hash_buckets (struct conn_hash *conn_hash)
int
conn_hash_add (struct conn_hash *conn_hash, struct lsquic_conn *lconn,
unsigned hash)
conn_hash_add (struct conn_hash *conn_hash, struct lsquic_conn *lconn)
{
assert(hash == XXH32(&lconn->cn_cid, sizeof(lconn->cn_cid),
(uintptr_t) conn_hash));
const unsigned hash = XXH32(&lconn->cn_cid, sizeof(lconn->cn_cid),
(uintptr_t) conn_hash);
if (conn_hash->ch_count >= conn_hash->ch_max_count)
return -1;
if (conn_hash->ch_count >=
@ -126,16 +123,6 @@ conn_hash_add (struct conn_hash *conn_hash, struct lsquic_conn *lconn,
}
int
conn_hash_add_new (struct conn_hash *conn_hash, struct lsquic_conn *lconn)
{
unsigned hash_val;
hash_val = XXH32(&lconn->cn_cid, sizeof(lconn->cn_cid),
(uintptr_t) conn_hash);
return conn_hash_add(conn_hash, lconn, hash_val);
}
void
conn_hash_remove (struct conn_hash *conn_hash, struct lsquic_conn *lconn)
{

11
src/liblsquic/lsquic_conn_hash.h
View file

@ -38,19 +38,12 @@ conn_hash_init (struct conn_hash *, unsigned max_count);
void
conn_hash_cleanup (struct conn_hash *);
/* If entry is not found, `hash' is set. Use it as argument to conn_hash_add.
* `hash' may be NULL.
*/
struct lsquic_conn *
conn_hash_find (struct conn_hash *conn_hash, lsquic_cid_t cid, unsigned *hash);
conn_hash_find (struct conn_hash *conn_hash, lsquic_cid_t);
/* Returns -1 if limit has been reached or if malloc fails */
int
conn_hash_add (struct conn_hash *, struct lsquic_conn *, unsigned hash);
/* Returns -1 if limit has been reached or if malloc fails */
int
conn_hash_add_new (struct conn_hash *, struct lsquic_conn *);
conn_hash_add (struct conn_hash *, struct lsquic_conn *);
void
conn_hash_remove (struct conn_hash *, struct lsquic_conn *);

4
src/liblsquic/lsquic_engine.c
View file

@ -492,7 +492,7 @@ new_full_conn_client (lsquic_engine_t *engine, const char *hostname,
engine->stream_if_ctx, flags, hostname, max_packet_size);
if (!conn)
return NULL;
if (0 != conn_hash_add_new(&engine->full_conns, conn))
if (0 != conn_hash_add(&engine->full_conns, conn))
{
LSQ_WARN("cannot add connection %"PRIu64" to hash - destroy",
conn->cn_cid);
@ -529,7 +529,7 @@ find_or_create_conn (lsquic_engine_t *engine, lsquic_packet_in_t *packet_in,
return NULL;
}
conn = conn_hash_find(&engine->full_conns, packet_in->pi_conn_id, NULL);
conn = conn_hash_find(&engine->full_conns, packet_in->pi_conn_id);
if (conn)
{
conn->cn_pf->pf_parse_packet_in_finish(packet_in, ppstate);