From 775c56353f0d7e235fbb482efaee1f469fc2fcc5 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Sun, 23 Oct 2016 21:37:28 +0200 Subject: [PATCH] l2tpd_cc_find_by_sockaddr: add sockaddr length to function signature osmo_sockaddr_equal requires an sockaddr length --- siu/l2tp/l2tpd_data.c | 6 ++---- siu/l2tp/l2tpd_data.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/siu/l2tp/l2tpd_data.c b/siu/l2tp/l2tpd_data.c index 0060a6c..8b3971a 100644 --- a/siu/l2tp/l2tpd_data.c +++ b/siu/l2tp/l2tpd_data.c @@ -23,11 +23,11 @@ l2tpd_cc_find_by_l_cc_id(struct l2tpd_instance *inst, uint32_t l_cc_id) struct l2tpd_connection * -l2tpd_cc_find_by_sockaddr(struct l2tpd_instance *inst, struct sockaddr *ss); +l2tpd_cc_find_by_sockaddr(struct l2tpd_instance *inst, struct sockaddr *ss, int ss_len) { struct l2tpd_connection *l2c; llist_for_each_entry(l2c, &inst->connections, list) { - if (sockaddr_equal(ss, &l2c->remote.ss)) + if (osmo_sockaddr_equal(ss, &l2c->remote.ss, ss_len)) return l2c; } return NULL; @@ -46,8 +46,6 @@ l2tpd_cc_alloc(struct l2tpd_instance *inst) return l2c; } - - struct l2tpd_session * l2tpd_sess_alloc(struct l2tpd_connection *conn) { diff --git a/siu/l2tp/l2tpd_data.h b/siu/l2tp/l2tpd_data.h index cb38fb1..c37680f 100644 --- a/siu/l2tp/l2tpd_data.h +++ b/siu/l2tp/l2tpd_data.h @@ -6,7 +6,7 @@ struct sockaddr; /* l2tp connection */ struct l2tpd_connection * -l2tpd_cc_find_by_sockaddr(struct l2tpd_instance *inst, struct sockaddr *ss); +l2tpd_cc_find_by_sockaddr(struct l2tpd_instance *inst, struct sockaddr *ss, int ss_len); struct l2tpd_connection * l2tpd_cc_find_by_l_cc_id(struct l2tpd_instance *inst, uint32_t l_cc_id);