diff --git a/src/devices/csma/csma-ipv4-topology.h b/src/devices/csma/csma-ipv4-topology.h index 37f546118..86be99d7a 100644 --- a/src/devices/csma/csma-ipv4-topology.h +++ b/src/devices/csma/csma-ipv4-topology.h @@ -97,7 +97,7 @@ public: * \param n1 Node * \param ndNum NetDevice number with which to associate address * \param addr1 Ipv4 Address for ndNum of n1 - * \param network network mask for ndNum of node n1 + * \param netmask1 network mask for ndNum of node n1 * * Add an Ipv4Address to the Ipv4 interface associated with the * ndNum CsmaIpv4NetDevices on the provided diff --git a/src/devices/csma/csma-net-device.h b/src/devices/csma/csma-net-device.h index 62e07f6fc..441ea04cd 100644 --- a/src/devices/csma/csma-net-device.h +++ b/src/devices/csma/csma-net-device.h @@ -99,8 +99,23 @@ enum CsmaEncapsulationMode { * * \param node the Node to which this device is connected. * \param addr The source MAC address of the net device. + * \param pktType the type of encapsulation */ CsmaNetDevice (Ptr node, Eui48Address addr, CsmaEncapsulationMode pktType); + + /** + * Construct a CsmaNetDevice + * + * This is the constructor for the CsmaNetDevice. It takes as a + * parameter the Node to which this device is connected. Ownership of the + * Node pointer is not implied and the node must not be deleted. + * + * \param node the Node to which this device is connected. + * \param addr The source MAC address of the net device. + * \param pktType the type of encapsulation + * \param sendEnable whether this device is able to send + * \param receiveEnable whether this device is able to receive + */ CsmaNetDevice (Ptr node, Eui48Address addr, CsmaEncapsulationMode pktType, bool sendEnable, bool receiveEnable); diff --git a/src/devices/point-to-point/point-to-point-net-device.h b/src/devices/point-to-point/point-to-point-net-device.h index 6112c7e19..d8d8d3242 100644 --- a/src/devices/point-to-point/point-to-point-net-device.h +++ b/src/devices/point-to-point/point-to-point-net-device.h @@ -175,7 +175,6 @@ protected: virtual Ptr DoGetChannel(void) const; /** * Set a new default data rate - * @param Data rate to set for new default */ static void SetDefaultRate(const DataRate&); diff --git a/src/node/socket.h b/src/node/socket.h index e3365fcd8..c717ec0a5 100644 --- a/src/node/socket.h +++ b/src/node/socket.h @@ -170,7 +170,6 @@ public: /** * \brief Send data (or dummy data) to the remote host * \param p packet to send - * \param dataSent Data sent callback. * \returns -1 in case of error or the number of bytes copied in the * internal buffer and accepted for transmission. */ @@ -180,7 +179,6 @@ public: * \brief Send data to a specified peer. * \param address IP Address of remote host * \param p packet to send - * \param dataSent Data sent callback. * \returns -1 in case of error or the number of bytes copied in the * internal buffer and accepted for transmission. */ diff --git a/src/routing/global-routing/global-router-interface.h b/src/routing/global-routing/global-router-interface.h index 66f0c7543..b6558eb20 100644 --- a/src/routing/global-routing/global-router-interface.h +++ b/src/routing/global-routing/global-router-interface.h @@ -431,7 +431,7 @@ public: /** * @brief Add an attached router to the list in the NetworkLSA * - * @param address The Ipv4Address of the interface on the network link + * @param addr The Ipv4Address of the interface on the network link * @returns The number of addresses in the list. */ uint32_t AddAttachedRouter (Ipv4Address addr);