Fix handling of other signature requirement

[onak.git] / stats.h

diff --git a/stats.h b/stats.h
index 19637eb2dba4e470af0dbbf168de6741b7d356e8..08d2eb6313f24f4ba9626168db9f6767e8e8df06 100644 (file)
--- a/stats.h
+++ b/stats.h
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /* MOSTSIGNED
@@ -33,9 +32,31 @@ key_getsigns - get the keys a key signs. */
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "keystructs.h"
+#include "keydb.h"
 #include "ll.h"
 
+/**
+ * @brief Holds key details suitable for doing stats on.
+ */
+struct stats_key {
+       /** The keyid. */
+       uint64_t keyid;
+       /** Used for marking during DFS/BFS. */
+       int colour;
+       /** The key that lead us to this one for DFS/BFS. */
+       uint64_t parent;
+       /** A linked list of the signatures on this key. */
+       struct ll *sigs;
+       /** A linked list of the keys this key signs. */
+       struct ll *signs;
+       /** A bool indicating if we've initialized the sigs element yet. */
+       bool gotsigs;
+       /** If we shouldn't consider the key in calculations. */
+       bool disabled;
+       /** If the key is revoked (and shouldn't be considered). */
+       bool revoked;
+};
+
 /**
  *     initcolour - Clear the key graph ready for use.
  *     @parent: Do we want to clear the parent pointers too?
@@ -54,7 +75,8 @@ void initcolour(bool parent);
  *     key we have. It returns as soon as a path is found or when we run out
  *     of keys; whichever comes sooner.
  */
-unsigned long findpath(struct stats_key *have, struct stats_key *want);
+unsigned long findpath(struct onak_dbctx *dbctx,
+               struct stats_key *have, struct stats_key *want);
 
 /**
  *     dofindpath - Given 2 keys displays a path between them.
@@ -67,8 +89,9 @@ unsigned long findpath(struct stats_key *have, struct stats_key *want);
  *     key we have. It returns as soon as a path is found or when we run out
  *     of keys; whichever comes sooner.
  */
-void dofindpath(uint64_t have, uint64_t want, bool html, int count);
+void dofindpath(struct onak_dbctx *dbctx,
+               uint64_t have, uint64_t want, bool html, int count);
 
-struct stats_key *furthestkey(struct stats_key *have);
+struct stats_key *furthestkey(struct onak_dbctx *dbctx, struct stats_key *have);
 
 #endif /* __STATS_H__ */