make format and make it compile with clang

llarp/dht/context.cpp

@@ -47,32 +47,32 @@ namespace llarp
       }
 
       bool
-      Validate(const RouterID &) const
+      Validate(const RouterID &) const override
       {
         // TODO: check with lokid
         return true;
       }
 
       void
-      Start(const TXOwner &peer)
+      Start(const TXOwner &peer) override
       {
         parent->DHTSendTo(peer.node,
                           new FindRouterMessage(parent->OurKey(), peer.txid));
       }
 
       bool
-      GetNextPeer(Key_t &, const std::set< Key_t > &)
+      GetNextPeer(Key_t &, const std::set< Key_t > &) override
       {
         return false;
       }
 
       void
-      DoNextRequest(const Key_t &)
+      DoNextRequest(const Key_t &) override
       {
       }
 
       void
-      SendReply()
+      SendReply() override
       {
         llarp::LogInfo("got ", valuesFound.size(), " routers from exploration");
         for(const auto &pk : valuesFound)
@@ -324,7 +324,7 @@ namespace llarp
       }
 
       bool
-      Validate(const service::IntroSet &value) const
+      Validate(const service::IntroSet &value) const override
       {
         if(!value.Verify(parent->Crypto(), parent->Now()))
         {
@@ -340,14 +340,14 @@ namespace llarp
       }
 
       bool
-      GetNextPeer(Key_t &next, const std::set< Key_t > &exclude)
+      GetNextPeer(Key_t &next, const std::set< Key_t > &exclude) override
       {
         Key_t k = target.data();
         return parent->nodes->FindCloseExcluding(k, next, exclude);
       }
 
       void
-      Start(const TXOwner &peer)
+      Start(const TXOwner &peer) override
       {
         parent->DHTSendTo(peer.node,
                           new FindIntroMessage(peer.txid, target, R));
@@ -365,7 +365,7 @@ namespace llarp
       }
 
       virtual void
-      SendReply()
+      SendReply() override
       {
         if(handleResult)
           handleResult(valuesFound);
@@ -442,7 +442,7 @@ namespace llarp
       }
 
       bool
-      Validate(const service::IntroSet &introset) const
+      Validate(const service::IntroSet &introset) const override
       {
         if(I.A != introset.A)
         {
@@ -454,7 +454,7 @@ namespace llarp
       }
 
       void
-      Start(const TXOwner &peer)
+      Start(const TXOwner &peer) override
       {
         std::vector< Key_t > exclude;
         for(const auto &router : dontTell)
@@ -464,18 +464,18 @@ namespace llarp
       }
 
       bool
-      GetNextPeer(Key_t &, const std::set< Key_t > &)
+      GetNextPeer(Key_t &, const std::set< Key_t > &) override
       {
         return false;
       }
 
       void
-      DoNextRequest(const Key_t &)
+      DoNextRequest(const Key_t &) override
       {
       }
 
       void
-      SendReply()
+      SendReply() override
       {
         // don't need this
       }
@@ -531,7 +531,7 @@ namespace llarp
       }
 
       bool
-      Validate(const service::IntroSet &introset) const
+      Validate(const service::IntroSet &introset) const override
       {
         if(!introset.Verify(parent->Crypto(), parent->Now()))
         {
@@ -547,26 +547,25 @@ namespace llarp
       }
 
       void
-      Start(const TXOwner &peer)
+      Start(const TXOwner &peer) override
       {
         parent->DHTSendTo(peer.node,
                           new FindIntroMessage(target, peer.txid, R));
       }
 
       bool
-      GetNextPeer(__attribute__((unused)) Key_t &nextpeer,
-                  __attribute__((unused)) const std::set< Key_t > &exclude)
+      GetNextPeer(Key_t &, const std::set< Key_t > &) override
       {
         return false;
       }
 
       void
-      DoNextRequest(__attribute__((unused)) const Key_t &nextPeer)
+      DoNextRequest(const Key_t &) override
       {
       }
 
       void
-      SendReply()
+      SendReply() override
       {
         std::set< service::IntroSet > found;
         for(const auto &remoteTag : valuesFound)
@@ -617,7 +616,7 @@ namespace llarp
       }
 
       void
-      SendReply()
+      SendReply() override
       {
         auto path =
             parent->router->paths.GetByUpstream(parent->OurKey(), localPath);
@@ -698,7 +697,7 @@ namespace llarp
       }
 
       bool
-      Validate(const RouterContact &rc) const
+      Validate(const RouterContact &rc) const override
       {
         if(!rc.Verify(parent->Crypto()))
         {
@@ -709,20 +708,18 @@ namespace llarp
       }
 
       bool
-      GetNextPeer(__attribute__((unused)) Key_t &next,
-                  __attribute__((unused)) const std::set< Key_t > &exclude)
+      GetNextPeer(Key_t &, const std::set< Key_t > &) override
       {
-        // TODO: implement iterative (?)
         return false;
       }
 
       void
-      DoNextRequest(__attribute__((unused)) const Key_t &next)
+      DoNextRequest(const Key_t &) override
       {
       }
 
       void
-      Start(const TXOwner &peer)
+      Start(const TXOwner &peer) override
       {
         parent->DHTSendTo(
             peer.node,
@@ -730,7 +727,7 @@ namespace llarp
       }
 
       virtual void
-      SendReply()
+      SendReply() override
       {
         if(resultHandler)
         {
@@ -758,7 +755,7 @@ namespace llarp
       }
 
       void
-      SendReply()
+      SendReply() override
       {
         auto path =
             parent->router->paths.GetByUpstream(parent->OurKey(), localPath);

llarp/handlers/exit.cpp

@@ -300,7 +300,9 @@ namespace llarp
         return false;
       huint32_t ip = GetIPForIdent(pk);
       m_ActiveExits.insert(std::make_pair(
-          pk, new llarp::exit::Endpoint(pk, path, !wantInternet, ip, this)));
+          pk,
+          std::unique_ptr< llarp::exit::Endpoint >(
+              new llarp::exit::Endpoint(pk, path, !wantInternet, ip, this))));
       m_Paths[path] = pk;
       return HasLocalMappedAddrFor(pk);
     }

llarp/net.cpp

@@ -378,7 +378,7 @@ _llarp_nt_getadaptersaddresses(struct llarp_nt_ifaddrs_t** ifap)
         /* default IPv6 route */
         if(AF_INET6 == lpSockaddr->sa_family && 0 == prefix->PrefixLength
            && IN6_IS_ADDR_UNSPECIFIED(
-                  &((struct sockaddr_in6*)(lpSockaddr))->sin6_addr))
+               &((struct sockaddr_in6*)(lpSockaddr))->sin6_addr))
         {
 #ifdef DEBUG
           fprintf(stderr,