FST: Fix search for peer's "other" connection

[mech_eap.git] / src / fst / fst_group.h

diff --git a/src/fst/fst_group.h b/src/fst/fst_group.h
index 9dcc666..00aee9c 100644 (file)
--- a/src/fst/fst_group.h
+++ b/src/fst/fst_group.h
@@ -12,7 +12,7 @@
 struct fst_group {
        char group_id[IFNAMSIZ + 1];
        struct dl_list ifaces;
-       u32 dialog_token;
+       u8 dialog_token;
        u32 fsts_id;
        struct dl_list global_groups_lentry;
 };
@@ -36,8 +36,6 @@ static inline Boolean fst_group_has_ifaces(struct fst_group *g)
 
 static inline struct fst_iface * fst_group_first_iface(struct fst_group *g)
 {
-       if (dl_list_empty(&g->ifaces))
-               return NULL;
        return dl_list_first(&g->ifaces, struct fst_iface, group_lentry);
 }
 
@@ -50,15 +48,9 @@ Boolean fst_group_delete_if_empty(struct fst_group *group);
 struct fst_iface * fst_group_get_iface_by_name(struct fst_group *g,
                                               const char *ifname);
 struct fst_iface *
-fst_group_find_new_iface_by_stie(struct fst_group *g,
-                                struct fst_iface *iface,
-                                const u8 *peer_addr,
-                                const struct session_transition_ie *stie,
-                                u8 *iface_peer_addr);
-struct fst_iface *
-fst_group_get_new_iface_by_stie_and_mbie(
-       struct fst_group *g, const u8 *mb_ies_buff, size_t mb_ies_size,
-       const struct session_transition_ie *stie, u8 *iface_peer_addr);
+fst_group_get_peer_other_connection(struct fst_iface *iface,
+                                   const u8 *peer_addr, u8 band_id,
+                                   u8 *other_peer_addr);
 u8  fst_group_assign_dialog_token(struct fst_group *g);
 u32 fst_group_assign_fsts_id(struct fst_group *g);
 
@@ -70,10 +62,8 @@ extern struct dl_list fst_global_groups_list;
 
 static inline struct fst_group * fst_first_group(void)
 {
-       if (dl_list_empty(&fst_global_groups_list))
-               return NULL;
        return dl_list_first(&fst_global_groups_list, struct fst_group,
-               global_groups_lentry);
+                            global_groups_lentry);
 }
 
 #endif /* FST_GROUP_H */