Support for UserService

src/gui/FWBTree.cpp

@@ -79,6 +79,7 @@ const char* systemObjects[] = {
     "Services/TCP",
     "Services/UDP",
     "Services/TagServices",
+    "Services/User",
 
     "Firewalls",
 

src/gui/FWObjectPropertiesFactory.cpp

@@ -63,6 +63,7 @@
 #include "fwbuilder/TCPService.h"
 #include "fwbuilder/UDPService.h"
 #include "fwbuilder/TagService.h"
+#include "fwbuilder/UserService.h"
 
 #include "fwbuilder/Interval.h"
 
@@ -198,6 +199,10 @@ QString FWObjectPropertiesFactory::getObjectProperties(FWObject *obj)
         } else if (TagService::isA(obj)) 
         {
             str << "Pattern: \"" << obj->getStr("tagcode").c_str() << "\"" ;
+        } else if (UserService::isA(obj)) 
+        {
+            const UserService* user_srv = UserService::constcast(obj);
+            str << "User id: \"" << user_srv->getUserId().c_str() << "\"" ;
         } else if (Interval::isA(obj))
         {
 
@@ -483,6 +488,10 @@ QString FWObjectPropertiesFactory::getObjectPropertiesDetailed(FWObject *obj,
         } else if (TagService::isA(obj)) 
         {
             str += QObject::tr("Pattern: \"%1\"").arg(obj->getStr("tagcode").c_str());
+        } else if (UserService::isA(obj)) 
+        {
+            const UserService* user_srv = UserService::constcast(obj);
+            str += QObject::tr("User id: \"%1\"").arg(user_srv->getUserId().c_str());
         } else if (Interval::isA(obj))
         {
 

src/gui/MainRes.qrc

@@ -181,6 +181,11 @@
         <file alias="Icons/UDPService/icon-ref">Icons/service-udp-ref_25.png</file>
         <file alias="Icons/UDPService/icon-tree">Icons/service-udp_16.png</file>
         <file alias="Icons/UDPService/icon">Icons/service-udp_25.png</file>
+        <file alias="Icons/UserService/icon-neg">Icons/user-neg_25.png</file>
+        <file alias="Icons/UserService/icon-neg-tree">Icons/user-neg_16.png</file>
+	<file alias="Icons/UserService/icon-ref">Icons/user-ref_25.png</file>
+        <file alias="Icons/UserService/icon-tree">Icons/user_16.png</file>
+        <file alias="Icons/UserService/icon">Icons/user_25.png</file>
         <file>Icons/stop.png</file>
         <file>Icons/uncheck.png</file>
         <file>Icons/undo.png</file>

src/res/objects_init.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="5" lastModified="1178590930" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="6" lastModified="1178590930" id="root">
   <Library color="#d4f8ff" comment="Standard objects" id="syslib000" name="Standard" ro="True">
     <AnyNetwork comment="Any Network" id="sysid0" name="Any" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService comment="Any IP Service" id="sysid1" name="Any" protocol_num="0"/>

src/res/resources.xml

@@ -359,6 +359,14 @@
       <icon-tree>service-custom_16.png</icon-tree>
     </CustomService>
 
+    <UserService>
+      <description>User</description>
+      <icon>user_25.png</icon>
+      <icon-neg>user-neg_25.png</icon-neg>
+      <icon-ref>user-ref_25.png</icon-ref>
+      <icon-tree>user_16.png</icon-tree>
+    </UserService>
+
     <NAT>
       <description>NAT</description>
       <icon-tree>blank_2x16.png</icon-tree>

src/res/resources.xml.in

@@ -359,6 +359,14 @@
       <icon-tree>service-custom_16.png</icon-tree>
     </CustomService>
 
+    <UserService>
+      <description>User</description>
+      <icon>user_25.png</icon>
+      <icon-neg>user-neg_25.png</icon-neg>
+      <icon-ref>user-ref_25.png</icon-ref>
+      <icon-tree>user_16.png</icon-tree>
+    </UserService>
+
     <NAT>
       <description>NAT</description>
       <icon-tree>blank_2x16.png</icon-tree>

src/res/templates.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
-<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="5" lastModified="1184450093" id="root">
+<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="6" lastModified="1184450093" id="root">
   <Library color="#d4f8ff" comment="Standard objects" id="syslib000" name="Standard" ro="False">
     <AnyNetwork comment="Any Network" id="sysid0" name="Any" address="0.0.0.0" netmask="0.0.0.0"/>
     <AnyIPService comment="Any IP Service" id="sysid1" name="Any" protocol_num="0"/>