From af4cd3e555887b5c233df46f169283e46479be96 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Mon, 12 May 2008 02:30:57 +0000
Subject: [PATCH] Support for UserService

---
 src/gui/FWBTree.cpp                   |   1 +
 src/gui/FWObjectPropertiesFactory.cpp |   9 +++++++++
 src/gui/Icons/user-neg_16.png         | Bin 0 -> 3493 bytes
 src/gui/Icons/user-neg_25.png         | Bin 0 -> 4100 bytes
 src/gui/Icons/user-ref_25.png         | Bin 0 -> 4146 bytes
 src/gui/Icons/user_16.png             | Bin 0 -> 1005 bytes
 src/gui/Icons/user_25.png             | Bin 0 -> 4187 bytes
 src/gui/MainRes.qrc                   |   5 +++++
 src/res/objects_init.xml              |   2 +-
 src/res/resources.xml                 |   8 ++++++++
 src/res/resources.xml.in              |   8 ++++++++
 src/res/templates.xml                 |   2 +-
 12 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 src/gui/Icons/user-neg_16.png
 create mode 100644 src/gui/Icons/user-neg_25.png
 create mode 100644 src/gui/Icons/user-ref_25.png
 create mode 100644 src/gui/Icons/user_16.png
 create mode 100644 src/gui/Icons/user_25.png

diff --git a/src/gui/FWBTree.cpp b/src/gui/FWBTree.cpp
index 65faf4d05..15f626f4c 100644
--- a/src/gui/FWBTree.cpp
+++ b/src/gui/FWBTree.cpp
@@ -79,6 +79,7 @@ const char* systemObjects[] = {
     "Services/TCP",
     "Services/UDP",
     "Services/TagServices",
+    "Services/User",
 
     "Firewalls",
 
diff --git a/src/gui/FWObjectPropertiesFactory.cpp b/src/gui/FWObjectPropertiesFactory.cpp
index cb1213d4e..95463c34b 100644
--- a/src/gui/FWObjectPropertiesFactory.cpp
+++ b/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))
         {
 
diff --git a/src/gui/Icons/user-neg_16.png b/src/gui/Icons/user-neg_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..95e2bf8cc75f2cb0f4d52fec0469a5576b84ba8e
GIT binary patch
literal 3493
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
T8Y>Xb00000NkvXXu0mjf$gzq_

literal 0
HcmV?d00001

diff --git a/src/gui/Icons/user-neg_25.png b/src/gui/Icons/user-neg_25.png
new file mode 100644
index 0000000000000000000000000000000000000000..d81e8c7f2257b05416c1b9dd6589114895503c0e
GIT binary patch
literal 4100
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
C`@vKI

literal 0
HcmV?d00001

diff --git a/src/gui/Icons/user-ref_25.png b/src/gui/Icons/user-ref_25.png
new file mode 100644
index 0000000000000000000000000000000000000000..8edef1714b305c902de9f61c8ec7c37d15196db4
GIT binary patch
literal 4146
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

literal 0
HcmV?d00001

diff --git a/src/gui/Icons/user_16.png b/src/gui/Icons/user_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9af890393c9a39da79ef708004f27f3335b2e16
GIT binary patch
literal 1005
zcmV<J0}}j+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#e@R3^RCwBA
zWIzQ>;^Go+a+16)GNPRF|Ni~|&+wmtk&%(%|NR%=_C9_2x&F<YSGR%c{=+l?1P}|d
zZf<TKAt`a5<}5!IV-W#1hQEIy>R6bW7@oZS5z)Wu2IreM4B<ebpD;ZD0fcM-BM=J9
zigJl6NbxhsC`vPMaBwrQa0oE4@yjw?I<b#|jp?d9P#qVt0RRESglxdSzyH|TSeO}k
zc{v!^SeO`ixH%a3__!JP`M4O=_01Vr*f>EJvLU+~Ab?Q3@bBNh-@pF+`^&+`$nf*W
zFNR-SzZe*Q{a|4D{)s_SL6L!-llvdorAPoEfZ#3=7Z>Lc5fL`{_~kdto3~#X7=C?c
z;9+NC;N|?!!20hC!-X>!7=Hfz$sjE)t;xm33D*Y@K+GT$IXO8cRMpiN*apN^amyL-
zU%&s7L0nXbVfn^m3}>!9V_;zAXIOaP8H1!*u(+&(V&u<{Z-hR7{CM)upFckU0tjRh
zGdnwbyp)B%-)ku+hT~TrGF)e|U=VYtV_2}|4#WISw-{t?^B68ZV`MmX?+e2RB_B3<
zyWj#gcJ^dY5C8-aC=A${SXi__u!u2yd-0lqnTwC%#r<mxt9Bk>;N|53$N1Ex8yH@`
zd(Xhh`=8<I(-#b!%n}TY%*=Wqy#N6OGJq8r`m8^H{bcy_|2+ebf)T@?Z|@maFI&p+
z?7<_3Kfix5eBZEzLC_=+XxM*-KVRQ5{QCPF#0JF%D?k9TfJ62FKgM6*zA*d(MlTnS
zAOn}MECZ)i6a(wuuMB^HiAlsFl!1wri{baDmkd9?ePUo^1^Jv26dQ~H0R)alP~80c
z`4t$Az%b?JXJGvQlYx<yg@I3AkAYQO4QLNL&_-a|`Tq|{eP#I1$Oey0fB<5F#3d8c
z-@m_r&INIRJZ3g{V*d}+#K^?Rz{ChN1W5n<{GNgBKPSj?a8v>W5X1%l{``7>b}Pe|
zFJJyMoB1&^YdZiP$O6tY!0=&U`uCsV_rG5ZUmsm&_<QTnzaN|&O#eWE0|Wp81ab%;
z5PJZz9UCjFskE}XDFcT9<9}d)vHbhN@RyMl=wv1aP`3Q{_5IJ+kM14%`TN%`p!6Z2
zo*e)I1Tp~VHU?oJmI7iuR#sLQVDJb64fqerT@bJQ2jw(IU{Zhl=kMR0K!N)}{1S-Y
b00bBSTd62;CTJ&500000NkvXXu0mjf?;Ou6

literal 0
HcmV?d00001

diff --git a/src/gui/Icons/user_25.png b/src/gui/Icons/user_25.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f265991beb018a2dfff34bcab7f32eae1e7bf3d
GIT binary patch
literal 4187
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

literal 0
HcmV?d00001

diff --git a/src/gui/MainRes.qrc b/src/gui/MainRes.qrc
index bc18ad8ea..c7528f8da 100644
--- a/src/gui/MainRes.qrc
+++ b/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>
diff --git a/src/res/objects_init.xml b/src/res/objects_init.xml
index f9355d4fb..3a64ecefa 100644
--- a/src/res/objects_init.xml
+++ b/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"/>
diff --git a/src/res/resources.xml b/src/res/resources.xml
index 64ef26a9c..92fb5204b 100644
--- a/src/res/resources.xml
+++ b/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>
diff --git a/src/res/resources.xml.in b/src/res/resources.xml.in
index a19cf4f14..bd5490965 100644
--- a/src/res/resources.xml.in
+++ b/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>
diff --git a/src/res/templates.xml b/src/res/templates.xml
index 46a687204..2e5f91542 100644
--- a/src/res/templates.xml
+++ b/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"/>