Menu
▾
▴
[Netemul-develop] SF.net SVN: netemul:[236] trunk
|
From: <sla...@us...> - 2011-02-09 12:26:24
|
Revision: 236
http://netemul.svn.sourceforge.net/netemul/?rev=236&view=rev
Author: slaste-nochka
Date: 2011-02-09 12:26:11 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
unworkable version
Modified Paths:
--------------
trunk/basicnetlib/basicnetlib.pro
trunk/basicnetlib/basicnetlib.pro.user
trunk/basicnetlib/basicnetlib_global.h
trunk/basicnetlib/frame.cpp
trunk/basicnetlib/frame.h
trunk/basicnetlib/macaddress.cpp
trunk/basicnetlib/macaddress.h
trunk/basicnetlib/packets/arppacket.cpp
trunk/basicnetlib/packets/arppacket.h
trunk/basicnetlib/packets/dhcppacket.cpp
trunk/basicnetlib/packets/dhcppacket.h
trunk/basicnetlib/packets/ippacket.cpp
trunk/basicnetlib/packets/ippacket.h
trunk/basicnetlib/packets/packets.pri
trunk/basicnetlib/packets/tcppacket.cpp
trunk/basicnetlib/packets/tcppacket.h
trunk/basicnetlib/packets/udppacket.cpp
trunk/basicnetlib/packets/udppacket.h
trunk/netemul.pro
trunk/src/chips/abstractchip.cpp
trunk/src/chips/abstractchip.h
trunk/src/chips/boxchip.cpp
trunk/src/chips/hubchip.cpp
trunk/src/chips/hubchip.h
trunk/src/chips/interface.cpp
trunk/src/chips/interface.h
trunk/src/chips/switchchip.cpp
trunk/src/chips/switchchip.h
trunk/src/deviceport.cpp
trunk/src/deviceport.h
trunk/src/devices/boxdevice.cpp
trunk/src/devices/computer.cpp
trunk/src/devices/computer.h
trunk/src/devices/hubdevice.h
trunk/src/devices/smartdevice.cpp
trunk/src/devices/smartdevice.h
trunk/src/devices/switchdevice.h
trunk/src/dialogs/adapterproperty.cpp
trunk/src/dialogs/adapterproperty.h
trunk/src/dialogs/computerproperty.cpp
trunk/src/dialogs/computerproperty.h
trunk/src/dialogs/designerdialog.cpp
trunk/src/dialogs/designerdialog.h
trunk/src/dialogs/dhcpserverproperty.cpp
trunk/src/dialogs/dhcpserverproperty.h
trunk/src/dialogs/hubproperty.h
trunk/src/dialogs/logdialog.cpp
trunk/src/dialogs/logdialog.h
trunk/src/dialogs/routeeditor.cpp
trunk/src/dialogs/routeeditor.h
trunk/src/dialogs/switchproperty.h
trunk/src/dialogs/tablearp.cpp
trunk/src/dialogs/tablearp.h
trunk/src/dialogs/tableswitch.cpp
trunk/src/forms/dhcpserverproperty.ui
trunk/src/forms/spoofingproperty.ui
trunk/src/ipedit.cpp
trunk/src/ipedit.h
trunk/src/models/arpmodel.cpp
trunk/src/models/arpmodel.h
trunk/src/models/dhcpservermodel.cpp
trunk/src/models/dhcpservermodel.h
trunk/src/models/switchmodel.cpp
trunk/src/models/switchmodel.h
trunk/src/programms/dhcpclientprogramm.cpp
trunk/src/programms/dhcpclientprogramm.h
trunk/src/programms/dhcpdemon.cpp
trunk/src/programms/dhcpdemon.h
trunk/src/programms/dhcpserverprogramm.cpp
trunk/src/programms/dhcpserverprogramm.h
trunk/src/programms/spoofingprogramm.cpp
trunk/src/programms/spoofingprogramm.h
trunk/src/tools/abstractsocket.h
trunk/src/tools/tcpsocket.cpp
trunk/src/tools/tcpsocket.h
trunk/src/tools/udpsocket.cpp
trunk/src/tools/udpsocket.h
Modified: trunk/basicnetlib/basicnetlib.pro
===================================================================
--- trunk/basicnetlib/basicnetlib.pro 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/basicnetlib.pro 2011-02-09 12:26:11 UTC (rev 236)
@@ -7,7 +7,8 @@
include(packets/packets.pri)
QT -= gui
-INCLUDEPATH += packets
+INCLUDEPATH += . \
+ packets
TARGET = basicnetlib
TEMPLATE = lib
@@ -21,9 +22,9 @@
frame.cpp
-HEADERS += basicnetlib.h\
- basicnetlib_global.h \
+HEADERS += basicnetlib.h \
macaddress.h \
ipaddress.h \
- frame.h
+ frame.h \
+ basicnetlib_global.h
Modified: trunk/basicnetlib/basicnetlib.pro.user
===================================================================
--- trunk/basicnetlib/basicnetlib.pro.user 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/basicnetlib.pro.user 2011-02-09 12:26:11 UTC (rev 236)
@@ -43,12 +43,12 @@
<value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
<value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
<valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt в PATH Отладка</value>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Отладка</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/netemul/trunk/basicnetlib-build-desktop</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
</valuemap>
<valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
@@ -77,151 +77,15 @@
<value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
<value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
<valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt в PATH Релиз</value>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Релиз</value>
<value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">C:/netemul/trunk/basicnetlib-build-desktop</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">9</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">2</value>
<value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
</valuemap>
- <valuemap key="ProjectExplorer.Target.BuildConfiguration.2" type="QVariantMap">
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
- <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
- </valuemap>
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
- <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
- <value type="QString">clean</value>
- </valuelist>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">4.5.0 Отладка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
- </valuemap>
- <valuemap key="ProjectExplorer.Target.BuildConfiguration.3" type="QVariantMap">
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
- <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
- </valuemap>
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
- <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
- <value type="QString">clean</value>
- </valuelist>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">4.5.0 Релиз</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">6</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
- </valuemap>
- <valuemap key="ProjectExplorer.Target.BuildConfiguration.4" type="QVariantMap">
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
- <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
- </valuemap>
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
- <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
- <value type="QString">clean</value>
- </valuelist>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt 4.7.0 OpenSource Отладка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">12</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
- </valuemap>
- <valuemap key="ProjectExplorer.Target.BuildConfiguration.5" type="QVariantMap">
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
- <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
- </valuemap>
- <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
- <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Сборка</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
- <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
- <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
- <value type="QString">clean</value>
- </valuelist>
- <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
- </valuemap>
- <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
- <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
- <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
- <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Qt 4.7.0 OpenSource Релиз</value>
- <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/frost/netemul/trunk/basicnetlib-build-desktop</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">12</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
- <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
- </valuemap>
- <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">6</value>
+ <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
<valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
<valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments" type="QVariantList"/>
<value key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase" type="int">2</value>
Modified: trunk/basicnetlib/basicnetlib_global.h
===================================================================
--- trunk/basicnetlib/basicnetlib_global.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/basicnetlib_global.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -1,7 +1,7 @@
#ifndef BASICNETLIB_GLOBAL_H
#define BASICNETLIB_GLOBAL_H
-#include <QtCore/qglobal.h>
+#include <QtCore/QtGlobal>
#if defined(BASICNETLIB_LIBRARY)
# define BASICNETLIBSHARED_EXPORT Q_DECL_EXPORT
Modified: trunk/basicnetlib/frame.cpp
===================================================================
--- trunk/basicnetlib/frame.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/frame.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -19,19 +19,19 @@
****************************************************************************************/
#include "frame.h"
-frame::frame(const QByteArray &b)
+Frame::Frame(const QByteArray &b)
{
d = new frameData;
QDataStream s(b);
s >> d->different >> d->sender >> d->receiver >> d->type >> d->data;
}
-QByteArray frame::toData() const
+QByteArray Frame::toData() const
{
return d->toArray();
}
-QString frame::toString() const
+QString Frame::toString() const
{
QString temp;
temp.append(QObject::tr("Ethernet, sender: %1 receiver: %2").arg(d->sender.toString()).arg(d->receiver.toString()));
@@ -43,7 +43,7 @@
frameData::frameData()
{
- different = frame::NORMAL;
+ different = Frame::NORMAL;
}
QByteArray frameData::toArray() const
Modified: trunk/basicnetlib/frame.h
===================================================================
--- trunk/basicnetlib/frame.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/frame.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -35,31 +35,31 @@
different(other.different) , data(other.data) { }
~frameData() { }
QByteArray toArray() const;
- friend class frame;
+ friend class Frame;
private:
- macAddress sender; //!< Mac-адрес отправителя
- macAddress receiver; //!< Mac-адрес получателя
+ MacAddress sender; //!< Mac-адрес отправителя
+ MacAddress receiver; //!< Mac-адрес получателя
qint8 type; //!< Показывает несет ли в себе кадр ip-пакет или arp сообщение.
qint8 different; //!< Разновидность фрэйма, влияет на его цвет и отображение
QByteArray data; //!< Данные протокола более высокого уровня.
};
/*!
- Реализует кадр, также как и в реальной сети содержит адрес отправителя, получателя и
+ Реализует кадр, также как и в реальной сети содержит адрес отправителя, получателя и
поле данных где содержиться информация протокола более высокого уровня.
*/
-class BASICNETLIBSHARED_EXPORT frame
+class BASICNETLIBSHARED_EXPORT Frame
{
public:
enum { arp = 100 , ip = 101 };
enum { NORMAL = 3 , BROADCAST = 4 };
- frame() { d = new frameData; }
- frame(const frame &other) : d(other.d) { }
- frame(const QByteArray &b);
- macAddress sender() const { return d->sender; }
- void setSender(macAddress temp) { d->sender = temp; }
- macAddress receiver() const { return d->receiver; }
- void setReceiver(macAddress temp) { d->receiver = temp; }
+ Frame() { d = new frameData; }
+ Frame(const Frame &other) : d(other.d) { }
+ Frame(const QByteArray &b);
+ MacAddress sender() const { return d->sender; }
+ void setSender(MacAddress temp) { d->sender = temp; }
+ MacAddress receiver() const { return d->receiver; }
+ void setReceiver(MacAddress temp) { d->receiver = temp; }
void setDifferent(qint8 t) { d->different = t; }
int type() const { return d->type; }
void setType(int t) { d->type = t; }
@@ -70,7 +70,7 @@
private:
QSharedDataPointer<frameData> d;
protected:
- friend QDataStream& operator<<(QDataStream &stream, const frame &f);
+ friend QDataStream& operator<<(QDataStream &stream, const Frame &f);
};
/*!
@@ -79,7 +79,7 @@
@param f - ссылка на кадр.
@return результирующий поток.
*/
-inline QDataStream& operator<<(QDataStream &stream, const frame &f)
+inline QDataStream& operator<<(QDataStream &stream, const Frame &f)
{
stream << f.toData();
return stream;
Modified: trunk/basicnetlib/macaddress.cpp
===================================================================
--- trunk/basicnetlib/macaddress.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/macaddress.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -1,119 +1,119 @@
-/****************************************************************************************
-** NetEmul - program for simulating computer networks.
-** Copyright © 2009 Semenov Pavel and Omilaeva Anastasia
-**
-** NetEmul is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-**
-** NetEmul is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public
-** License along with the NetEmul; if not, write to the Free
-** Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-** 02111-1307 USA.
-****************************************************************************************/
-#include "macaddress.h"
-#include <QStringList>
-
-macAddress::macAddress()
-{
- for ( int i = 0 ; i < 6 ; i++ )
- myMac[i] = 0;
-}
-
-macAddress::macAddress(QString str)
-{
- setMac(str);
-}
-
-macAddress::macAddress(const macAddress &other)
-{
- for (int i = 0 ; i < 6 ; i ++)
- myMac[i] = other.myMac[i];
-}
-
-QString macAddress::toString() const
-{
- QString temp = QString("%1").arg( QString().setNum(myMac[0],16), 2 , QChar('0'));
- int i;
- for ( i = 1 ; i <= 5 ; i++ ) {
- temp.append(QChar(':'));
- temp = temp + QString("%1").arg(myMac[i],2,16,QChar('0'));
- }
- return temp.toUpper();
-}
-
-macAddress& macAddress::operator=(const macAddress &other)
-{
- for (int i = 0 ; i < 6 ; i ++)
- myMac[i] = other.myMac[i];
- return (*this);
-}
-
-macAddress macAddress::operator++()
-{
- int i = 5;
- while ( i >= 0 && myMac[i] == 255) {
- myMac[i] = 0;
- i--;
- }
- myMac[i]++;
- return *this;
-}
-
-macAddress macAddress::operator++(int notused)
-{
- Q_UNUSED(notused);
- macAddress temp = *this;
- int i = 5;
- while ( i >= 0 && myMac[i] == 255) {
- myMac[i] = 0;
- i--;
- }
- myMac[i]++;
- return temp;
-}
-
-void macAddress::setBroadcast()
-{
- int i;
- for (i = 0 ; i < 6 ; i++)
- myMac[i] = 0xFF;
-}
-
-bool macAddress::isBroadcast()
-{
- int i;
- for (i = 0; i < 6 ; i++)
- if ( myMac[i] != 0xFF ) return false;
- return true;
-}
-
-void macAddress::setRandom()
-{
- int i;
- myMac[0] = 0x01;
- for ( i = 1 ; i < 6 ; i++ )
- myMac[i] = qrand()%256;
-}
-
-void macAddress::setMac(QString str)
-{
- QStringList s = str.split(":");
- for (int i = 0 ; i < 6 ; i++)
- myMac[i] = s.at(i).toInt(0,16);
-}
-
-bool macAddress::isEmpty() const
-{
- for ( int i = 0 ; i < 6 ; i++ )
- if ( myMac[i] ) return false;
- return true;
-}
-
-
+/****************************************************************************************
+** NetEmul - program for simulating computer networks.
+** Copyright © 2009 Semenov Pavel and Omilaeva Anastasia
+**
+** NetEmul is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** NetEmul is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with the NetEmul; if not, write to the Free
+** Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+** 02111-1307 USA.
+****************************************************************************************/
+#include "macaddress.h"
+#include <QStringList>
+
+MacAddress::MacAddress()
+{
+ for ( int i = 0 ; i < 6 ; i++ )
+ myMac[i] = 0;
+}
+
+MacAddress::MacAddress(QString str)
+{
+ setMac(str);
+}
+
+MacAddress::MacAddress(const MacAddress &other)
+{
+ for (int i = 0 ; i < 6 ; i ++)
+ myMac[i] = other.myMac[i];
+}
+
+QString MacAddress::toString() const
+{
+ QString temp = QString("%1").arg( QString().setNum(myMac[0],16), 2 , QChar('0'));
+ int i;
+ for ( i = 1 ; i <= 5 ; i++ ) {
+ temp.append(QChar(':'));
+ temp = temp + QString("%1").arg(myMac[i],2,16,QChar('0'));
+ }
+ return temp.toUpper();
+}
+
+MacAddress& MacAddress::operator=(const MacAddress &other)
+{
+ for (int i = 0 ; i < 6 ; i ++)
+ myMac[i] = other.myMac[i];
+ return (*this);
+}
+
+MacAddress MacAddress::operator++()
+{
+ int i = 5;
+ while ( i >= 0 && myMac[i] == 255) {
+ myMac[i] = 0;
+ i--;
+ }
+ myMac[i]++;
+ return *this;
+}
+
+MacAddress MacAddress::operator++(int notused)
+{
+ Q_UNUSED(notused);
+ MacAddress temp = *this;
+ int i = 5;
+ while ( i >= 0 && myMac[i] == 255) {
+ myMac[i] = 0;
+ i--;
+ }
+ myMac[i]++;
+ return temp;
+}
+
+void MacAddress::setBroadcast()
+{
+ int i;
+ for (i = 0 ; i < 6 ; i++)
+ myMac[i] = 0xFF;
+}
+
+bool MacAddress::isBroadcast()
+{
+ int i;
+ for (i = 0; i < 6 ; i++)
+ if ( myMac[i] != 0xFF ) return false;
+ return true;
+}
+
+void MacAddress::setRandom()
+{
+ int i;
+ myMac[0] = 0x01;
+ for ( i = 1 ; i < 6 ; i++ )
+ myMac[i] = qrand()%256;
+}
+
+void MacAddress::setMac(QString str)
+{
+ QStringList s = str.split(":");
+ for (int i = 0 ; i < 6 ; i++)
+ myMac[i] = s.at(i).toInt(0,16);
+}
+
+bool MacAddress::isEmpty() const
+{
+ for ( int i = 0 ; i < 6 ; i++ )
+ if ( myMac[i] ) return false;
+ return true;
+}
+
+
Modified: trunk/basicnetlib/macaddress.h
===================================================================
--- trunk/basicnetlib/macaddress.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/macaddress.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -1,74 +1,75 @@
-/****************************************************************************************
-** NetEmul - program for simulating computer networks.
-** Copyright © 2009 Semenov Pavel and Omilaeva Anastasia
-**
-** NetEmul is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License as published by the Free Software Foundation; either
-** version 2.1 of the License, or (at your option) any later version.
-**
-** NetEmul is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-** Lesser General Public License for more details.
-**
-** You should have received a copy of the GNU Lesser General Public
-** License along with the NetEmul; if not, write to the Free
-** Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-** 02111-1307 USA.
-****************************************************************************************/
-#ifndef MACADDRESS_H
-#define MACADDRESS_H
-
-#include <QDataStream>
-#include "basicnetlib_global.h"
-
-class BASICNETLIBSHARED_EXPORT macAddress
-{
-public:
- macAddress();
- macAddress(QString str);
- macAddress(const macAddress &other);
- void setMac(QString str);
- void setRandom();
- QString toString() const ;
- macAddress operator++();
- macAddress operator++(int notused);
- macAddress& operator=(const macAddress &other);
- void setBroadcast();
- bool isBroadcast();
- bool isEmpty() const;
- qulonglong toInt() const;
-private:
- quint8 myMac[6];
-protected:
- friend QDataStream& operator<<(QDataStream &stream, const macAddress &address);
- friend QDataStream& operator>>(QDataStream &stream, macAddress &address);
-};
-
-inline qulonglong macAddress::toInt() const
-{
- return ((qulonglong)myMac[0]<<40)+((qulonglong)myMac[1]<<32)+((qulonglong)myMac[2]<<24)+
- ((qulonglong)myMac[3]<<16)+((qulonglong)myMac[4]<<8)+(qulonglong)myMac[5];
-}
-inline bool operator<(const macAddress &e1 , const macAddress &e2) { return e1.toInt() < e2.toInt(); }
-inline bool operator>(const macAddress &e1 , const macAddress &e2) { return e1.toInt() > e2.toInt(); }
-inline bool operator==(const macAddress &e1 , const macAddress &e2) { return e1.toInt() == e2.toInt(); }
-inline bool operator!=(const macAddress &e1, const macAddress &e2) { return !(e1 == e2); }
-inline bool operator>=(const macAddress &e1 , const macAddress &e2) { return !(e1 < e2); }
-inline bool operator<=(const macAddress &e1 , const macAddress &e2) { return !(e1 > e2); }
-
-
-inline QDataStream& operator<<(QDataStream &stream, const macAddress &address)
-{
- for (int i = 0 ; i < 6 ; i++ ) stream << address.myMac[i];
- return stream;
-}
-
-inline QDataStream& operator>>(QDataStream &stream, macAddress &address)
-{
- for (int i = 0 ; i < 6 ; i++ ) stream >> address.myMac[i];
- return stream;
-}
-
-#endif // MACADDRESS_H
+/****************************************************************************************
+** NetEmul - program for simulating computer networks.
+** Copyright © 2009 Semenov Pavel and Omilaeva Anastasia
+**
+** NetEmul is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** NetEmul is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with the NetEmul; if not, write to the Free
+** Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+** 02111-1307 USA.
+****************************************************************************************/
+#ifndef MACADDRESS_H
+#define MACADDRESS_H
+
+#include <QDataStream>
+#include "basicnetlib_global.h"
+
+class BASICNETLIBSHARED_EXPORT MacAddress
+{
+public:
+ MacAddress();
+ MacAddress(QString str);
+ MacAddress(const MacAddress &other);
+ void setMac(QString str);
+ void setRandom();
+ QString toString() const ;
+ MacAddress operator++();
+ MacAddress operator++(int notused);
+ MacAddress& operator=(const MacAddress &other);
+ void setBroadcast();
+ bool isBroadcast();
+ bool isEmpty() const;
+ qulonglong toInt() const;
+private:
+ quint8 myMac[6];
+protected:
+ friend QDataStream& operator<<(QDataStream &stream, const MacAddress &address);
+ friend QDataStream& operator>>(QDataStream &stream, MacAddress &address);
+};
+
+inline qulonglong MacAddress::toInt() const
+{
+ return ((qulonglong)myMac[0]<<40)+((qulonglong)myMac[1]<<32)+((qulonglong)myMac[2]<<24)+
+ ((qulonglong)myMac[3]<<16)+((qulonglong)myMac[4]<<8)+(qulonglong)myMac[5];
+}
+inline bool operator<(const MacAddress &e1 , const MacAddress &e2) { return e1.toInt() < e2.toInt(); }
+inline bool operator>(const MacAddress &e1 , const MacAddress &e2) { return e1.toInt() > e2.toInt(); }
+inline bool operator==(const MacAddress &e1 , const MacAddress &e2) { return e1.toInt() == e2.toInt(); }
+inline bool operator!=(const MacAddress &e1, const MacAddress &e2) { return !(e1 == e2); }
+inline bool operator>=(const MacAddress &e1 , const MacAddress &e2) { return !(e1 < e2); }
+inline bool operator<=(const MacAddress &e1 , const MacAddress &e2) { return !(e1 > e2); }
+
+
+inline QDataStream& operator<<(QDataStream &stream, const MacAddress &address)
+{
+ for (int i = 0 ; i < 6 ; i++ ) stream << address.myMac[i];
+ return stream;
+}
+
+inline QDataStream& operator>>(QDataStream &stream, MacAddress &address)
+{
+ for (int i = 0 ; i < 6 ; i++ ) stream >> address.myMac[i];
+ return stream;
+}
+
+#endif // MACADDRESS_H
+
Modified: trunk/basicnetlib/packets/arppacket.cpp
===================================================================
--- trunk/basicnetlib/packets/arppacket.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/arppacket.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -19,9 +19,9 @@
****************************************************************************************/
#include "arppacket.h"
-arpPacket::arpPacket(macAddress rm , macAddress sm , IpAddress ri , IpAddress si , quint8 t)
+ArpPacket::ArpPacket(MacAddress rm , MacAddress sm , IpAddress ri , IpAddress si , quint8 t)
{
- d = new arpPacketData;
+ d = new ArpPacketData;
d->receiverMac = rm;
d->senderMac = sm;
d->receiverIp = ri;
@@ -29,14 +29,14 @@
d->type = t;
}
-arpPacket::arpPacket(const QByteArray &b)
+ArpPacket::ArpPacket(const QByteArray &b)
{
- d = new arpPacketData;
+ d = new ArpPacketData;
QDataStream s(b);
s >> d->type >> d->senderMac >> d->receiverMac >> d->senderIp >> d->receiverIp;
}
-QByteArray arpPacket::toData() const
+QByteArray ArpPacket::toData() const
{
return d->toData();
}
@@ -44,7 +44,7 @@
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
-QByteArray arpPacketData::toData() const
+QByteArray ArpPacketData::toData() const
{
QByteArray t;
QDataStream s(&t,QIODevice::WriteOnly);
@@ -52,7 +52,7 @@
return t;
}
-arpPacketData::arpPacketData(const arpPacketData &other) : QSharedData(other)
+ArpPacketData::ArpPacketData(const ArpPacketData &other) : QSharedData(other)
{
receiverMac = other.receiverMac;
senderMac = other.senderMac;
Modified: trunk/basicnetlib/packets/arppacket.h
===================================================================
--- trunk/basicnetlib/packets/arppacket.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/arppacket.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -26,45 +26,45 @@
#include "ipaddress.h"
-class arpPacketData : public QSharedData
+class ArpPacketData : public QSharedData
{
public:
- arpPacketData() { }
- arpPacketData(const arpPacketData &other);
- ~arpPacketData() { }
+ ArpPacketData() { }
+ ArpPacketData(const ArpPacketData &other);
+ ~ArpPacketData() { }
QByteArray toData() const;
- friend class arpPacket;
+ friend class ArpPacket;
private:
quint8 type;
- macAddress senderMac;
- macAddress receiverMac;
+ MacAddress senderMac;
+ MacAddress receiverMac;
IpAddress senderIp;
IpAddress receiverIp;
};
-class BASICNETLIBSHARED_EXPORT arpPacket
+class BASICNETLIBSHARED_EXPORT ArpPacket
{
public:
- arpPacket(macAddress rm , macAddress sm , IpAddress ri , IpAddress si , quint8 t);
- arpPacket(const arpPacket &other) : d(other.d) { }
- arpPacket() { d = new arpPacketData; }
- arpPacket(const QByteArray &b);
+ ArpPacket(MacAddress rm , MacAddress sm , IpAddress ri , IpAddress si , quint8 t);
+ ArpPacket(const ArpPacket &other) : d(other.d) { }
+ ArpPacket() { d = new ArpPacketData; }
+ ArpPacket(const QByteArray &b);
QByteArray toData() const;
enum { request = 0 , response = 1 };
void setType(int i) { d->type = i; }
int type() const { return d->type; }
- void setSenderMac(macAddress m) { d->senderMac = m; }
+ void setSenderMac(MacAddress m) { d->senderMac = m; }
void setSenderIp(IpAddress a) { d->senderIp = a; }
- void setReceiverMac(macAddress m) { d->receiverMac = m; }
+ void setReceiverMac(MacAddress m) { d->receiverMac = m; }
void setReceiverIp(IpAddress a) { d->receiverIp = a; }
- macAddress senderMac() const { return d->senderMac; }
+ MacAddress senderMac() const { return d->senderMac; }
IpAddress senderIp() const { return d->senderIp; }
- macAddress receiverMac() const { return d->receiverMac; }
+ MacAddress receiverMac() const { return d->receiverMac; }
IpAddress receiverIp() const { return d->receiverIp; }
private:
- QSharedDataPointer<arpPacketData> d;
+ QSharedDataPointer<ArpPacketData> d;
protected:
- friend QDataStream& operator<<(QDataStream &stream,const arpPacket &p);
+ friend QDataStream& operator<<(QDataStream &stream,const ArpPacket &p);
};
//-------------------------------------------------------------------
/*!
@@ -73,7 +73,7 @@
@param p - пакет для записи.
@return обновленный поток.
*/
-inline QDataStream& operator<<(QDataStream &stream,const arpPacket &p)
+inline QDataStream& operator<<(QDataStream &stream,const ArpPacket &p)
{
stream << p.toData();
return stream;
Modified: trunk/basicnetlib/packets/dhcppacket.cpp
===================================================================
--- trunk/basicnetlib/packets/dhcppacket.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/dhcppacket.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -21,21 +21,21 @@
static const QString TYPES_DHCP_MESSAGES[] = { "DHCPDISCOVER" , "DHCPOFFER" , "DHCPREQUEST" , "DHCPACK" , "DHCPDECLINE" };
-dhcpPacket::dhcpPacket()
+DhcpPacket::DhcpPacket()
{
- d = new dhcpPacketData;
+ d = new DhcpPacketData;
}
-dhcpPacket::dhcpPacket(const QByteArray &data)
+DhcpPacket::DhcpPacket(const QByteArray &data)
{
- d = new dhcpPacketData;
+ d = new DhcpPacketData;
QDataStream s(data);
s >> d->xid >> d->type >> d->yiaddr >> d->siaddr >> d->chaddr >> d->mask >> d->gateway >> d->time;
}
/*!
* Выполняет сериализацию.
*/
-QByteArray dhcpPacket::toData() const
+QByteArray DhcpPacket::toData() const
{
return d->toData();
}
@@ -43,13 +43,13 @@
/*!
* Преобразует тип пакета в строковое представление.
*/
-QString dhcpPacket::typeString() const
+QString DhcpPacket::typeString() const
{
return TYPES_DHCP_MESSAGES[ d->type ];
}
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
-dhcpPacketData::dhcpPacketData(const dhcpPacketData &other) : QSharedData(other)
+DhcpPacketData::DhcpPacketData(const DhcpPacketData &other) : QSharedData(other)
{
xid = other.xid;
type = other.type;
@@ -63,7 +63,7 @@
/*!
* Преобразует содержимое в последовательность байт.
*/
-QByteArray dhcpPacketData::toData() const
+QByteArray DhcpPacketData::toData() const
{
QByteArray d;
QDataStream s(&d, QIODevice::WriteOnly);
Modified: trunk/basicnetlib/packets/dhcppacket.h
===================================================================
--- trunk/basicnetlib/packets/dhcppacket.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/dhcppacket.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -25,14 +25,14 @@
#include "ipaddress.h"
#include "macaddress.h"
-class dhcpPacketData : public QSharedData
+class DhcpPacketData : public QSharedData
{
public:
- dhcpPacketData() { time = 0; }
- dhcpPacketData(const dhcpPacketData &other);
- ~dhcpPacketData() { }
+ DhcpPacketData() { time = 0; }
+ DhcpPacketData(const DhcpPacketData &other);
+ ~DhcpPacketData() { }
QByteArray toData() const;
- friend class dhcpPacket;
+ friend class DhcpPacket;
private:
int xid;
int type;
@@ -41,23 +41,23 @@
IpAddress gateway;
IpAddress yiaddr;
IpAddress siaddr;
- macAddress chaddr;
+ MacAddress chaddr;
};
-class BASICNETLIBSHARED_EXPORT dhcpPacket
+class BASICNETLIBSHARED_EXPORT DhcpPacket
{
public:
- dhcpPacket();
- dhcpPacket(const QByteArray &data);
- dhcpPacket(const dhcpPacket &other) : d(other.d) { }
- ~dhcpPacket() { }
+ DhcpPacket();
+ DhcpPacket(const QByteArray &data);
+ DhcpPacket(const DhcpPacket &other) : d(other.d) { }
+ ~DhcpPacket() { }
QByteArray toData() const;
enum { DHCPDISCOVER , DHCPOFFER , DHCPREQUEST , DHCPACK , DHCPDECLINE };
void setYiaddr(IpAddress a) { d->yiaddr = a; }
void setSiaddr(IpAddress a) { d->siaddr = a; }
void setMask(IpAddress a) { d->mask = a; }
void setGateway(IpAddress a) { d->gateway = a; }
- void setChaddr(macAddress a) { d->chaddr = a; }
+ void setChaddr(MacAddress a) { d->chaddr = a; }
void setXid(int x) { d->xid = x; }
void setType(int t) { d->type = t; }
void setTime(int t) { d->time = t; }
@@ -68,10 +68,10 @@
IpAddress siaddr() const { return d->siaddr; }
IpAddress mask() const { return d->mask; }
IpAddress gateway() const { return d->gateway; }
- macAddress chaddr() const { return d->chaddr; }
+ MacAddress chaddr() const { return d->chaddr; }
QString typeString() const;
private:
- QSharedDataPointer<dhcpPacketData> d;
+ QSharedDataPointer<DhcpPacketData> d;
};
#endif // DHCPPACKET_H
Modified: trunk/basicnetlib/packets/ippacket.cpp
===================================================================
--- trunk/basicnetlib/packets/ippacket.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/ippacket.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -19,16 +19,16 @@
****************************************************************************************/
#include "ippacket.h"
-ipPacket::ipPacket(const QByteArray &b)
+IpPacket::IpPacket(const QByteArray &b)
{
- d = new ipPacketData;
+ d = new IpPacketData;
QDataStream s(b);
s >> d->sender >> d->receiver >> d->upProtocol >> d->data >> d->ttl;
}
-ipPacket::ipPacket(IpAddress s,IpAddress r)
+IpPacket::IpPacket(IpAddress s,IpAddress r)
{
- d = new ipPacketData;
+ d = new IpPacketData;
d->sender = s ;
d->receiver = r;
d->ttl = 64;
@@ -38,26 +38,26 @@
@param mask - маска сети, по которой идет проверка.
@return - true - широковещательный, false - в противном случае.
*/
-bool ipPacket::isBroadcast(const IpAddress mask) const
+bool IpPacket::isBroadcast(const IpAddress mask) const
{
IpAddress a = ~mask;
if ( ( d->receiver & a ) == a) return true;
return false;
}
//----------------------------------------------------
-QByteArray ipPacket::toData() const
+QByteArray IpPacket::toData() const
{
return d->toData();
}
-QString ipPacket::toString() const
+QString IpPacket::toString() const
{
QString temp;
temp.append(QObject::tr("IP packet, sender: %1, receiver: %2 TTL: %3").arg(d->sender.toString()).arg(d->receiver.toString()).arg(d->ttl));
return temp;
}
-quint16 ipPacket::receiverSocket() const
+quint16 IpPacket::receiverSocket() const
{
QDataStream stream(d->data);
quint16 t;
@@ -65,7 +65,7 @@
return t;
}
-quint8 ipPacket::decTtl()
+quint8 IpPacket::decTtl()
{
d->ttl--;
return d->ttl;
@@ -76,7 +76,7 @@
/*!
* Переводит пакет в массив байт.
*/
-QByteArray ipPacketData::toData() const
+QByteArray IpPacketData::toData() const
{
QByteArray t;
QDataStream s(&t,QIODevice::WriteOnly);
@@ -87,7 +87,7 @@
/*!
* Копирующий конструктор данных.
*/
-ipPacketData::ipPacketData(const ipPacketData &other) : QSharedData(other)
+IpPacketData::IpPacketData(const IpPacketData &other) : QSharedData(other)
{
sender = other.sender;
receiver = other.receiver;
Modified: trunk/basicnetlib/packets/ippacket.h
===================================================================
--- trunk/basicnetlib/packets/ippacket.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/ippacket.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -27,13 +27,13 @@
/*!
* Содержит в себе разделяемые между ip пакетами данные.
*/
-class ipPacketData : public QSharedData
+class IpPacketData : public QSharedData
{
public:
- ipPacketData() { }
- ipPacketData(const ipPacketData &other);
- ~ipPacketData() { }
- friend class ipPacket;
+ IpPacketData() { }
+ IpPacketData(const IpPacketData &other);
+ ~IpPacketData() { }
+ friend class IpPacket;
private:
IpAddress sender; //!< Адрес отправителя.
IpAddress receiver; //!< Адрес получателя.
@@ -49,16 +49,16 @@
тип протокола верхнего уровня и поле данных. Остальные папраметры реального пакета пока
не используются.
*/
-class BASICNETLIBSHARED_EXPORT ipPacket
+class BASICNETLIBSHARED_EXPORT IpPacket
{
public:
/*! Используется для обозначения протокола верхнего уровня. */
enum { udp = 0 , tcp = 1 };
- ipPacket() { d = new ipPacketData; d->ttl = 64; }
- ipPacket(const QByteArray &b);
- ipPacket(IpAddress s,IpAddress r);
- ~ipPacket() { }
- ipPacket(const ipPacket &other) : d(other.d) { }
+ IpPacket() { d = new IpPacketData; d->ttl = 64; }
+ IpPacket(const QByteArray &b);
+ IpPacket(IpAddress s,IpAddress r);
+ ~IpPacket() { }
+ IpPacket(const IpPacket &other) : d(other.d) { }
QByteArray toData() const;
QString toString() const;
@@ -78,10 +78,10 @@
int size() { return d->data.size(); }
QByteArray unpack() const { return d->data; }
private:
- QSharedDataPointer<ipPacketData> d; //!< Данные пакета.
+ QSharedDataPointer<IpPacketData> d; //!< Данные пакета.
protected:
- friend bool operator==(const ipPacket &p1,const ipPacket &p2);
- friend QDataStream& operator<<(QDataStream &stream,const ipPacket &p);
+ friend bool operator==(const IpPacket &p1,const IpPacket &p2);
+ friend QDataStream& operator<<(QDataStream &stream,const IpPacket &p);
};
//---------------------------------------------------------------------------
/*!
@@ -90,7 +90,7 @@
@param p - записываемый пакет.
@return ссылку на результирующий поток.
*/
-inline QDataStream& operator<<(QDataStream &stream,const ipPacket &p)
+inline QDataStream& operator<<(QDataStream &stream,const IpPacket &p)
{
stream << p.toData();
return stream;
@@ -100,12 +100,12 @@
Назначает пакету широковещательный адрес исходя из маски.
@param mask - Маска.
*/
-inline void ipPacket::setBroadcast(const IpAddress mask)
+inline void IpPacket::setBroadcast(const IpAddress mask)
{
d->receiver = d->sender | ~mask;
}
//---------------------------------------------------
-inline bool operator==(const ipPacket &p1,const ipPacket &p2)
+inline bool operator==(const IpPacket &p1,const IpPacket &p2)
{
return ( p1.sender() == p2.sender() && p1.receiver() == p2.receiver() );
}
Modified: trunk/basicnetlib/packets/packets.pri
===================================================================
--- trunk/basicnetlib/packets/packets.pri 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/packets.pri 2011-02-09 12:26:11 UTC (rev 236)
@@ -1,10 +1,10 @@
-SOURCES += packets/dhcppacket.cpp\
- packets/arppacket.cpp\
- packets/ippacket.cpp\
- packets/tcppacket.cpp\
+SOURCES += packets/dhcppacket.cpp \
+ packets/arppacket.cpp \
+ packets/ippacket.cpp \
+ packets/tcppacket.cpp \
packets/udppacket.cpp
-HEADERS += packets/dhcppacket.h\
- packets/arppacket.h\
- packets/ippacket.h\
- packets/tcppacket.h\
+HEADERS += packets/dhcppacket.h \
+ packets/arppacket.h \
+ packets/ippacket.h \
+ packets/tcppacket.h \
packets/udppacket.h
Modified: trunk/basicnetlib/packets/tcppacket.cpp
===================================================================
--- trunk/basicnetlib/packets/tcppacket.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/tcppacket.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -19,9 +19,9 @@
****************************************************************************************/
#include "tcppacket.h"
-tcpPacket::tcpPacket(const QByteArray &b)
+TcpPacket::TcpPacket(const QByteArray &b)
{
- d = new tcpPacketData;
+ d = new TcpPacketData;
QDataStream s(b);
s >> d->receiver >> d->sender >> d->sequence >> d->ack >> d->flag >> d->window >> d->data;
}
@@ -32,21 +32,21 @@
@param p - записываемый пакет.
@return ссылку на результирующий поток.
*/
-QDataStream& operator<<( QDataStream &stream, const tcpPacket &p )
+QDataStream& operator<<( QDataStream &stream, const TcpPacket &p )
{
stream << p.toData();
return stream;
}
//-------------------------------------------------------
-QString tcpPacket::toString() const
+QString TcpPacket::toString() const
{
QString temp;
temp.append("TCP, "+QObject::tr("sender port: %1, receiver port: %2").arg(d->sender).arg(d->receiver) );
return temp;
}
-tcpPacketData::tcpPacketData(const tcpPacketData &u) : QSharedData(u)
+TcpPacketData::TcpPacketData(const TcpPacketData &u) : QSharedData(u)
{
sender = u.sender;
receiver = u.receiver;
@@ -57,7 +57,7 @@
data = u.data;
}
-QByteArray tcpPacketData::toData() const
+QByteArray TcpPacketData::toData() const
{
QByteArray t;
QDataStream s(&t,QIODevice::WriteOnly);
Modified: trunk/basicnetlib/packets/tcppacket.h
===================================================================
--- trunk/basicnetlib/packets/tcppacket.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/tcppacket.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -24,14 +24,14 @@
#include <QSharedData>
#include "basicnetlib_global.h"
-class tcpPacketData : public QSharedData
+class TcpPacketData : public QSharedData
{
public:
- tcpPacketData() { }
- tcpPacketData(const tcpPacketData &other);
- ~tcpPacketData() { }
+ TcpPacketData() { }
+ TcpPacketData(const TcpPacketData &other);
+ ~TcpPacketData() { }
QByteArray toData() const;
- friend class tcpPacket;
+ friend class TcpPacket;
private:
quint16 sender; //!< Порт отправителя
quint16 receiver; //!< Порт получателя
@@ -45,15 +45,15 @@
/*!
Реализует tcp-сегмент
*/
-class BASICNETLIBSHARED_EXPORT tcpPacket
+class BASICNETLIBSHARED_EXPORT TcpPacket
{
public:
enum { User = 7777 , Window = 10240 };
enum { NO_FLAGS = 0, SYN = 1, ACK = 2, FIN = 4, RST = 8 };
- tcpPacket() { d = new tcpPacketData; }
- tcpPacket(const QByteArray &b);
- tcpPacket(const tcpPacket &other) : d(other.d) { }
- ~tcpPacket() { }
+ TcpPacket() { d = new TcpPacketData; }
+ TcpPacket(const QByteArray &b);
+ TcpPacket(const TcpPacket &other) : d(other.d) { }
+ ~TcpPacket() { }
QByteArray toData() const { return d->toData(); }
int size() const { return d->data.size(); }
void setSender(quint16 s) { d->sender = s; }
@@ -72,9 +72,9 @@
void pack(const QByteArray &b) { d->data = b; }
QString toString() const;
private:
- QSharedDataPointer<tcpPacketData> d;
+ QSharedDataPointer<TcpPacketData> d;
protected:
- friend QDataStream& operator<<( QDataStream &stream, const tcpPacket &p );
+ friend QDataStream& operator<<( QDataStream &stream, const TcpPacket &p );
};
#endif // TCPPACKET_H
Modified: trunk/basicnetlib/packets/udppacket.cpp
===================================================================
--- trunk/basicnetlib/packets/udppacket.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/udppacket.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -19,19 +19,19 @@
****************************************************************************************/
#include "udppacket.h"
-QByteArray udpPacket::toData() const
+QByteArray UdpPacket::toData() const
{
return d->toData();
}
-udpPacket::udpPacket(const QByteArray &b)
+UdpPacket::UdpPacket(const QByteArray &b)
{
- d = new udpPacketData;
+ d = new UdpPacketData;
QDataStream s(b);
s >> d->receiver >> d->sender >> d->data;
}
-QString udpPacket::typeToString() const
+QString UdpPacket::typeToString() const
{
switch ( d->receiver ) {
case User: return QObject::tr("UDP Message user");
@@ -41,7 +41,7 @@
}
}
-QString udpPacket::toString() const
+QString UdpPacket::toString() const
{
QString temp;
temp.append("UDP, "+QObject::tr("sender port: %1, receiver port: %2").arg(d->sender).arg(d->receiver) );
@@ -51,14 +51,14 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-udpPacketData::udpPacketData(const udpPacketData &u) : QSharedData(u)
+UdpPacketData::UdpPacketData(const UdpPacketData &u) : QSharedData(u)
{
sender = u.sender;
receiver = u.receiver;
data = u.data;
}
-QByteArray udpPacketData::toData() const
+QByteArray UdpPacketData::toData() const
{
QByteArray t;
QDataStream s(&t,QIODevice::WriteOnly);
Modified: trunk/basicnetlib/packets/udppacket.h
===================================================================
--- trunk/basicnetlib/packets/udppacket.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/basicnetlib/packets/udppacket.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -24,14 +24,14 @@
#include <QDataStream>
#include <QSharedData>
-class udpPacketData : public QSharedData
+class UdpPacketData : public QSharedData
{
public:
- udpPacketData() { }
- udpPacketData(const udpPacketData &other);
- ~udpPacketData() { }
+ UdpPacketData() { }
+ UdpPacketData(const UdpPacketData &other);
+ ~UdpPacketData() { }
QByteArray toData() const;
- friend class udpPacket;
+ friend class UdpPacket;
private:
quint16 sender; //!< Порт отправителя
quint16 receiver; //!< Порт получателя
@@ -40,14 +40,14 @@
/*!
Реализует udp-дейтаграмму
*/
-class BASICNETLIBSHARED_EXPORT udpPacket
+class BASICNETLIBSHARED_EXPORT UdpPacket
{
public:
enum { User = 7777 , RIP = 520 , DHCPClient = 67, DHCPServer = 68 } ;
- udpPacket() { d = new udpPacketData; }
- udpPacket(const QByteArray &b);
- udpPacket(const udpPacket &u) : d(u.d) { }
- ~udpPacket() { }
+ UdpPacket() { d = new UdpPacketData; }
+ UdpPacket(const QByteArray &b);
+ UdpPacket(const UdpPacket &u) : d(u.d) { }
+ ~UdpPacket() { }
QByteArray toData() const;
int size() const { return d->data.size(); }
void setSender( quint16 i ) { d->sender = i;}
@@ -59,9 +59,9 @@
QString typeToString() const;
QString toString() const;
private:
- QSharedDataPointer<udpPacketData> d;
+ QSharedDataPointer<UdpPacketData> d;
protected:
- friend QDataStream& operator<<( QDataStream &stream, const udpPacket &p );
+ friend QDataStream& operator<<( QDataStream &stream, const UdpPacket &p );
};
//-----------------------------------------------------
/*!
@@ -70,7 +70,7 @@
@param p - записываемый пакет.
@return ссылку на результирующий поток.
*/
-inline QDataStream& operator<<( QDataStream &stream, const udpPacket &p )
+inline QDataStream& operator<<( QDataStream &stream, const UdpPacket &p )
{
stream << p.toData();
return stream;
Modified: trunk/netemul.pro
===================================================================
--- trunk/netemul.pro 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/netemul.pro 2011-02-09 12:26:11 UTC (rev 236)
@@ -49,7 +49,7 @@
SCRIPT_PATH = "scripts"
win32 {
DESTDIR = ../trunk
- message("Static link ...")
+# message("Static link ...")
# DEFINES += QT_NO_DEBUG_OUTPUT
# CONFIG += static
}
Modified: trunk/src/chips/abstractchip.cpp
===================================================================
--- trunk/src/chips/abstractchip.cpp 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/src/chips/abstractchip.cpp 2011-02-09 12:26:11 UTC (rev 236)
@@ -64,16 +64,16 @@
obj->deleteLater();
}
-void AbstractChip::checkReceive(frame &f)
+void AbstractChip::checkReceive(Frame &f)
{
myStatistics.receiveFrames++;
- if ( f.type() == frame::ip ) myStatistics.receivePackets++;
+ if ( f.type() == Frame::ip ) myStatistics.receivePackets++;
}
-void AbstractChip::checkSend(frame &f)
+void AbstractChip::checkSend(Frame &f)
{
myStatistics.sendFrames++;
- if ( f.type() == frame::ip ) myStatistics.sendPackets++;
+ if ( f.type() == Frame::ip ) myStatistics.sendPackets++;
}
Modified: trunk/src/chips/abstractchip.h
===================================================================
--- trunk/src/chips/abstractchip.h 2011-02-09 01:36:43 UTC (rev 235)
+++ trunk/src/chips/abstractchip.h 2011-02-09 12:26:11 UTC (rev 236)
@@ -27,7 +27,7 @@
#include "frame.h"
class DevicePort;
-class ipPacket;
+class IpPacket;
/*!
Класс являеться абстрактным устройством приема и обработки кадров.
@@ -44,21 +44,21 @@
public:
AbstractChip(QObject *parent = 0);
virtual ~AbstractChip() { }
- virtual void receiveEvent(frame &fr,DevicePort *sender) = 0;
+ virtual void receiveEvent(Frame &fr,DevicePort *sender) = 0;
virtual int trafficDigit() const = 0;
QString statisticsString() const { return myStatistics.toString(); }
QVariant statisticsObject() const;
Q_INVOKABLE void setStatisticsObject(StatisticsObject *obj);
- void checkReceive(frame &f);
- void checkSend(frame &f);
- macAddress mac() const { return myMac; }
+ void checkReceive(Frame &f);
+ void checkSend(Frame &f);
+ MacAddress mac() const { return myMac; }
IpAddress ip() const { return myIp; }
IpAddress mask() const { return myMask; }
QString ipString() c...
[truncated message content] |
