1
0
mirror of https://github.com/mfontanini/libtins synced 2026-01-30 05:24:26 +01:00

Removed PDU::clone_packet and renamed PDU::clone_pdu to PDU::clone.

This commit is contained in:
Matias Fontanini
2012-09-11 16:54:14 -03:00
parent 7cbd32361a
commit e8151724c4
38 changed files with 106 additions and 117 deletions

View File

@@ -270,9 +270,9 @@ namespace Tins {
PDU *clone_packet(const uint8_t *ptr, uint32_t total_sz);
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
ARP *clone_pdu() const {
ARP *clone() const {
return new ARP(*this);
}
private:

View File

@@ -291,9 +291,9 @@ namespace Tins {
PDUType pdu_type() const { return PDU::BOOTP; }
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
BootP *clone_pdu() const {
BootP *clone() const {
return new BootP(*this);
}
protected:

View File

@@ -379,9 +379,9 @@ namespace Tins {
uint32_t header_size() const;
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
DHCP *clone_pdu() const {
DHCP *clone() const {
return new DHCP(*this);
}
private:

View File

@@ -481,9 +481,9 @@ namespace Tins {
resources_type dns_answers();
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
DNS *clone_pdu() const {
DNS *clone() const {
return new DNS(*this);
}
private:

View File

@@ -401,6 +401,13 @@ namespace Tins {
* \sa PDU::pdu_type
*/
PDUType pdu_type() const { return pdu_flag; }
/**
* \sa PDU::clone
*/
Dot11 *clone() const {
return new Dot11(*this);
}
/**
* \brief Check wether this PDU matches the specified flag.
@@ -1550,9 +1557,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11Beacon *clone_pdu() const {
Dot11Beacon *clone() const {
return new Dot11Beacon(*this);
}
@@ -1647,9 +1654,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11Disassoc *clone_pdu() const {
Dot11Disassoc *clone() const {
return new Dot11Disassoc(*this);
}
private:
@@ -1750,9 +1757,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11AssocRequest *clone_pdu() const {
Dot11AssocRequest *clone() const {
return new Dot11AssocRequest(*this);
}
private:
@@ -1868,9 +1875,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11AssocResponse *clone_pdu() const {
Dot11AssocResponse *clone() const {
return new Dot11AssocResponse(*this);
}
private:
@@ -1987,9 +1994,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11ReAssocRequest *clone_pdu() const {
Dot11ReAssocRequest *clone() const {
return new Dot11ReAssocRequest(*this);
}
private:
@@ -2106,9 +2113,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11ReAssocResponse *clone_pdu() const {
Dot11ReAssocResponse *clone() const {
return new Dot11ReAssocResponse(*this);
}
private:
@@ -2225,9 +2232,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11Authentication *clone_pdu() const {
Dot11Authentication *clone() const {
return new Dot11Authentication(*this);
}
private:
@@ -2317,9 +2324,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11Deauthentication *clone_pdu() const {
Dot11Deauthentication *clone() const {
return new Dot11Deauthentication(*this);
}
private:
@@ -2384,9 +2391,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu()
* \sa PDU::clone()
*/
Dot11ProbeRequest* clone_pdu() const {
Dot11ProbeRequest* clone() const {
return new Dot11ProbeRequest(*this);
}
@@ -2479,9 +2486,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu()
* \sa PDU::clone()
*/
Dot11ProbeResponse* clone_pdu() const {
Dot11ProbeResponse* clone() const {
return new Dot11ProbeResponse(*this);
}
@@ -2629,9 +2636,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11Data *clone_pdu() const {
Dot11Data *clone() const {
return new Dot11Data(*this);
}
protected:
@@ -2713,9 +2720,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11QoSData *clone_pdu() const {
Dot11QoSData *clone() const {
return new Dot11QoSData(*this);
}
@@ -2882,9 +2889,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11RTS *clone_pdu() const {
Dot11RTS *clone() const {
return new Dot11RTS(*this);
}
@@ -2938,9 +2945,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11PSPoll *clone_pdu() const {
Dot11PSPoll *clone() const {
return new Dot11PSPoll(*this);
}
@@ -2994,9 +3001,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11CFEnd *clone_pdu() const {
Dot11CFEnd *clone() const {
return new Dot11CFEnd(*this);
}
@@ -3049,9 +3056,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11EndCFAck *clone_pdu() const {
Dot11EndCFAck *clone() const {
return new Dot11EndCFAck(*this);
}
@@ -3103,9 +3110,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11Ack *clone_pdu() const {
Dot11Ack *clone() const {
return new Dot11Ack(*this);
}
@@ -3209,9 +3216,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11BlockAckRequest *clone_pdu() const {
Dot11BlockAckRequest *clone() const {
return new Dot11BlockAckRequest(*this);
}
@@ -3346,9 +3353,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
Dot11BlockAck *clone_pdu() const {
Dot11BlockAck *clone() const {
return new Dot11BlockAck(*this);
}
private:

View File

@@ -313,9 +313,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
RC4EAPOL *clone_pdu() const {
RC4EAPOL *clone() const {
return new RC4EAPOL(*this);
}
private:
@@ -519,9 +519,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
RSNEAPOL *clone_pdu() const {
RSNEAPOL *clone() const {
return new RSNEAPOL(*this);
}
private:

View File

@@ -181,9 +181,9 @@ namespace Tins {
PDU *clone_packet(const uint8_t *ptr, uint32_t total_sz);
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
EthernetII *clone_pdu() const {
EthernetII *clone() const {
return new EthernetII(*this);
}
private:

View File

@@ -303,9 +303,9 @@ namespace Tins {
PDU *clone_packet(const uint8_t *ptr, uint32_t total_sz);
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
ICMP *clone_pdu() const {
ICMP *clone() const {
return new ICMP(*this);
}
private:

View File

@@ -179,9 +179,9 @@ namespace Tins {
PDU *clone_packet(const uint8_t *ptr, uint32_t total_sz);
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
IEEE802_3 *clone_pdu() const {
IEEE802_3 *clone() const {
return new IEEE802_3(*this);
}
private:

View File

@@ -547,9 +547,9 @@ namespace Tins {
PDU *clone_packet(const uint8_t *ptr, uint32_t total_sz);
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
IP *clone_pdu() const {
IP *clone() const {
return new IP(*this);
}
private:

View File

@@ -300,9 +300,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
LLC *clone_pdu() const {
LLC *clone() const {
return new LLC(*this);
}
private:

View File

@@ -205,19 +205,7 @@ namespace Tins {
* The pointer returned must be deleted by the user.
* \return A pointer to a clone of this packet.
*/
PDU *clone_packet() const;
/**
* \brief Clones this PDU.
*
* This method does not clone the inner PDUs. \sa PDU::clone_packet
* \return A pointer to a copy of this PDU.
*/
virtual PDU *clone_pdu() const {
/* Should be pure virtual. It's this way to avoid compiling issues.
* Once every pdu has implemented it, make it pure virtual. */
return 0;
}
virtual PDU *clone() const = 0;
/** \brief Send the stack of PDUs through a PacketSender.
*
@@ -327,7 +315,7 @@ namespace Tins {
* \brief Generic clone pdu method.
*/
template<class T>
T *do_clone_pdu() const {
T *do_clone() const {
T *new_pdu = new T(*static_cast<const T*>(this));
//new_pdu->copy_inner_pdu(*this);
return new_pdu;

View File

@@ -273,6 +273,13 @@ namespace Tins {
*/
uint32_t trailer_size() const;
/**
* \sa PDU::clone
*/
RadioTap *clone() const {
return new RadioTap(*this);
}
/**
* \brief Getter for the PDU's type.
* \sa PDU::pdu_type

View File

@@ -107,9 +107,9 @@ namespace Tins {
PDUType pdu_type() const { return PDU::RAW; }
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
RawPDU *clone_pdu() const {
RawPDU *clone() const {
return new RawPDU(*this);
}
private:

View File

@@ -134,9 +134,9 @@ namespace Tins {
/**
* \brief Clones this PDU.
*
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
SNAP *clone_pdu() const {
SNAP *clone() const {
return new SNAP(*this);
}
private:

View File

@@ -377,9 +377,9 @@ namespace Tins {
const tcp_option *search_option(Option opt) const;
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
TCP *clone_pdu() const {
TCP *clone() const {
return new TCP(*this);
}
private:

View File

@@ -109,9 +109,9 @@ namespace Tins {
PDUType pdu_type() const { return PDU::UDP; }
/**
* \sa PDU::clone_pdu
* \sa PDU::clone
*/
PDU *clone_pdu() const {
PDU *clone() const {
return new UDP(*this);
}
private: