Testversion für Target

QmlTest/main.qml

@@ -21,7 +21,7 @@ Window {
         id: idItf
         itfFilterName: "eth0"
         itfFilterAF: Interface.AF_Inet
-        itfFilterMethod: Interface.IM_Static
+        itfFilterMethod: Interface.IM_Dhcp
         onSigError:
         {
             console.error(msg);
@@ -34,8 +34,8 @@ Window {
         {
             if(idItf.filteredInterfaces.length > 0)
             {
-                idItf.filteredInterfaces[0].ipAddress.address = "192.168.0.256"
-                idItf.filteredInterfaces[0].ipAddress.address = "155.18.2.156"
+                idItf.filteredInterfaces[0].ipAddress.address = "192.168.0.256";
+                idItf.filteredInterfaces[0].ipAddress.address = "155.18.2.156";
                 idItf.filteredInterfaces[0].ipAddress.b0 = 255;
                 console.log(idItf.filteredInterfaces[0].ipAddress.address);
             }
@@ -45,8 +45,8 @@ Window {
             }
 
             idItf.itfFilterName = "eth1";
-            idItf.itfFilterMethod = Interface.IM_Dhcp
-            idItf.saveAs("/home/wrk/share/gfanet/libgfanet/res/testitf");
+            idItf.itfFilterMethod = Interface.IM_Static;
+//            idItf.saveAs("/home/wrk/share/gfanet/libgfanet/res/testitf");
         }
     }
 }

qtplugin/netinterfaces.cpp

@@ -33,14 +33,6 @@ void NetInterfaces::componentComplete()
 
 void NetInterfaces::reset(void)
 {
-/*	for(auto it = m_itfList.begin(); it != m_itfList.end(); it++)
-	{
-		Interface *pi = *it;
-		delete pi;
-	}
-
-	m_itfList.clear();*/
-
 	Interface *pItf;
 	
     for(int i = 0; i < m_interfaces.count(); i++)
@@ -65,7 +57,6 @@ bool NetInterfaces::initialize(void)
 		{
 			ITF_IFACE_BLOCK &ibl = *it;
 			m_interfaces.append(new Interface(ibl, static_cast<const Emitter&>(*this), this));
-//			m_itfList.push_back(new Interface(ibl, static_cast<const Emitter&>(*this), this));
 		}
 
 		emit interfaces_Changed();
@@ -104,11 +95,9 @@ QVariantList NetInterfaces::getInterface(const QString &itfName)
 
 	if(m_eni.ibl.size() > 0)
 	{
-//		for(auto it = m_itfList.begin(); it != m_itfList.end(); it++)
 	    for(int i = 0; i < m_interfaces.count(); i++)
 		{
 	        Interface *pi = m_interfaces.at(i);
-//			Interface *pi = *it;
 			const ITF_IFACE_BLOCK &ibl = pi->getIface();
 
 			if(	itfName == ibl.cfgName.c_str() &&
@@ -135,8 +124,6 @@ QVariant NetInterfaces::newInterface(QString name, int af, int method, QString c
 
 	m_interfaces.append(pi);
 	emit interfaces_Changed();
-
-//	m_itfList.push_back(pi);
 	return QVariant::fromValue(pi);
 }
 
@@ -232,7 +219,6 @@ Interface::Interface(ITF_IFACE_BLOCK &ifb, const Emitter &errHandler, QObject *p
 																							m_bcastAddr(ifb.inet4s.bcast, errHandler, this),
 																							m_ptpAddr(ifb.inet4s.pointopoint, errHandler, this),
 																							m_errHandler(errHandler)
-																							/*, m_dnsSvr(ifb.inet4s.namesvr)*/
 {
 	setObjectName("Interface");
 	for(size_t i = 0; i < _countof(m_ifb.inet4s.namesvr); i++)
@@ -296,10 +282,6 @@ int Interface::itfMethod(void) const
 IPv4Address* Interface::ipAddress(void)
 {
 	return &m_ipAddr;
-//	if(m_ifb.proto == IFP_Inet && m_ifb.method == IFM_Static)
-//		return inet_ntoa(m_ifb.inet4s.addr);
-//	else
-//		return "";
 }
 
 IPv4Address* Interface::netMask(void)
@@ -322,33 +304,11 @@ IPv4Address* Interface::ptpAddress(void)
 	return &m_ptpAddr;
 }
 
-#if 0
-QStringList Interface::dnsServers(void) const
-{
-	return m_dnsList;
-}
-#endif
-
 QQmlListProperty<IPv4Address> Interface::dnsServer(void)
 {
 	return QQmlListProperty<IPv4Address>(this, m_dnsList);
 }
 
-/*QString Interface::dns1(void) const
-{
-	return inet_ntoa(m_ifb.inet4s.namesvr[0]);
-}
-
-QString Interface::dns2(void) const
-{
-	return inet_ntoa(m_ifb.inet4s.namesvr[1]);
-}
-
-QString Interface::dns3(void) const
-{
-	return inet_ntoa(m_ifb.inet4s.namesvr[2]);
-}*/
-
 /////////////////////////////////////////////////////////////////////////////
 
 IPv4Address::IPv4Address(struct in_addr &addr, const Emitter &errHandler, QObject *pParent) : QObject(pParent), m_addr(addr), m_errHandler(errHandler)
@@ -478,15 +438,3 @@ void IPv4Address::set_b3(int b)
 	emit b3_Changed(b);
 	emit address_Changed(address());
 }
-
-/////////////////////////////////////////////////////////////////////////////
-
-#if 0
-Nameservers::Nameservers(struct in_addr (&namesvr)[3], QObject *pParent) : QObject(pParent), m_dnsSvr(namesvr)
-{
-}
-
-Nameservers::~Nameservers(void)
-{
-}
-#endif

qtplugin/netinterfaces.h

@@ -188,7 +188,6 @@ signals:
 
 private:
 	ETC_NETWORK_INTERFACES m_eni;
-//	std::vector<Interface*> m_itfList;
 	QList<Interface*> m_interfaces;
 	QList<Interface*> m_filteredInterfaces;
 	QString m_itfFilterName;

qtplugin/pdump.sh

@@ -6,11 +6,11 @@ URI="gfa.plugins.qml.net"
 VERSION=1.0
 
 # Desktop:
-OUTFILE="/home/wrk/Qt5.7.0/5.7/gcc_64/qml/gfa/plugins/qml/net/net.qmltypes"
-IMPORTPATH="/home/wrk/share/gfanet/qtplugin/Debug/Desktop_Qt_5_7_0_GCC_64bit"
+#OUTFILE="/home/wrk/Qt5.7.0/5.7/gcc_64/qml/gfa/plugins/qml/net/net.qmltypes"
+#IMPORTPATH="/home/wrk/share/gfanet/qtplugin/Debug/Desktop_Qt_5_7_0_GCC_64bit"
 
 # Target:
-#OUTFILE="/opt/GfA/TC_L312_C493_QT57/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/qml/gfa/plugins/qml/net/net.qmltypes"
-#IMPORTPATH="/home/wrk/share/gfanet/qtplugin/Debug/GfA_Device"
+OUTFILE="/opt/GfA/TC_L312_C493_QT57/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/qml/gfa/plugins/qml/net/net.qmltypes"
+IMPORTPATH="/home/wrk/share/gfanet/qtplugin/Debug/GfA_Device"
 
 $PDUMP $URI $VERSION $IMPORTPATH > $OUTFILE