Commit 1a3f2de4 authored by Pavel Vainerman's avatar Pavel Vainerman

backported to p8 as 2.8-alt2.M80P.3 (with rpmbph script)

parents 3f94b4cd 217d9a34
......@@ -382,6 +382,8 @@ int main(int argc, char** argv)
return 1;
}
int mtype = uni_atoi(argv[optind]);
std::string consumers(optarg);
ostringstream txt;
if( checkArg(optind+1, argc, argv) == 0 )
......@@ -397,15 +399,14 @@ int main(int argc, char** argv)
if( checkArg(i, argc, argv) == 0 )
break;
txt << " " << argv[optind+1];
txt << " " << argv[i];
}
auto conf = uniset_init(argc, argv, conffile);
UInterface ui(conf);
ui.initBackId(uniset::AdminID);
int mtype = uni_atoi(argv[optind]);
sendText(optarg, ui, txt.str(), mtype);
sendText(consumers, ui, txt.str(), mtype);
return 0;
}
break;
......@@ -1134,6 +1135,8 @@ void sendText( const string& args, UInterface& ui, const string& txt, int mtype
auto conf = uniset_conf();
auto sl = uniset::getObjectsList( args, conf );
cout << "mtype=" << mtype << " txt: " << txt << endl;
for( auto && it : sl )
{
if( it.node == DefaultObjectId )
......
......@@ -26,7 +26,7 @@
Name: libuniset2
Version: 2.8
Release: alt1.M80P.2
Release: alt2.M80P.3
Summary: UniSet - library for building distributed industrial control systems
License: LGPL
......@@ -546,9 +546,12 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
# history of current unpublished changes
%changelog
* Tue Feb 05 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt1.M80P.2
* Tue Feb 05 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt2.M80P.3
- backport to ALTLinux p8 (by rpmbph script)
* Tue Feb 05 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt3
- (admin): fix error in "sendText" funciton
* Mon Feb 04 2019 Pavel Vainerman <pv@altlinux.ru> 2.8-alt2
- added 'mtype' for TextMessage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment