-simplify logic

git-svn-id: https://gnunet.org/svn/gnunet@33847 140774ce-b5e7-0310-ab8b-a85725594a96
-add missing calls to monitor

git-svn-id: https://gnunet.org/svn/gnunet@33848 140774ce-b5e7-0310-ab8b-a85725594a96