net: Removed enable_shared_from_this from packets

Author: AndreasAakesson

api/net/ip4/packet_arp.hpp

@@ -6,9 +6,9 @@
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,62 +24,61 @@
 
 namespace net
 {
-  class PacketArp : public Packet,
-                    public std::enable_shared_from_this<PacketArp>
+  class PacketArp : public Packet
   {
   public:
     Arp::header& header() const
     {
       return *(Arp::header*) buffer();
     }
-    
+
     static const size_t headers_size = sizeof(Arp::header);
-    
+
     /** initializes to a default, empty Arp packet, given
         a valid MTU-sized buffer */
     void init(Ethernet::addr local_mac, IP4::addr local_ip)
-    {            
+    {
       auto& hdr = header();
       hdr.ethhdr.type = Ethernet::ETH_ARP;
       hdr.htype = Arp::H_htype_eth;
       hdr.ptype = Arp::H_ptype_ip4;
       hdr.hlen_plen = Arp::H_hlen_plen;
-      
+
       hdr.dipaddr = next_hop();
       hdr.sipaddr = local_ip;
       hdr.shwaddr = local_mac;
     }
-    
+
     void set_dest_mac(Ethernet::addr mac) {
       header().dhwaddr = mac;
-      header().ethhdr.dest = mac; 
-    } 
-    
+      header().ethhdr.dest = mac;
+    }
+
     void set_opcode(Arp::Opcode op) {
       header().opcode = op;
     }
-    
+
     void set_dest_ip(IP4::addr ip) {
       header().dipaddr = ip;
     }
-    
+
     IP4::addr source_ip() const {
       return header().sipaddr;
     }
-    
+
     IP4::addr dest_ip() const {
       return header().dipaddr;
     }
-    
+
     Ethernet::addr source_mac() const {
       return header().ethhdr.src;
     };
-    
+
     Ethernet::addr dest_mac() const {
       return header().ethhdr.dest;
     };
-    
-    
+
+
   };
 }
 

api/net/ip4/packet_ip4.hpp

@@ -26,8 +26,7 @@
 
 namespace net {
 
-  class PacketIP4 : public Packet, // might work as upcast:
-                    public std::enable_shared_from_this<PacketIP4>
+  class PacketIP4 : public Packet
   {
   public:
     static constexpr size_t DEFAULT_TTL {64};

api/net/ip4/packet_udp.hpp

@@ -23,8 +23,7 @@
 
 namespace net
 {
-  class PacketUDP : public PacketIP4, // might work as upcast:
-                    public std::enable_shared_from_this<PacketUDP>
+  class PacketUDP : public PacketIP4
   {
   public:
 

api/net/packet.hpp

@@ -28,7 +28,7 @@ namespace net
   class Packet;
   using Packet_ptr = std::unique_ptr<Packet>;
 
-  class Packet : public std::enable_shared_from_this<Packet>
+  class Packet
   {
   public:
     /**
@@ -54,7 +54,7 @@ namespace net
           bufstore->release(this);
       else
           delete[] (uint8_t*) this;
-    } // see: buffer_store.cpp
+    }
 
     /** Get the buffer */
     BufferStore::buffer_t buffer() const noexcept