Skip to content

Commit

Permalink
pass version number to acct mgr
Browse files Browse the repository at this point in the history
svn path=/trunk/boinc/; revision=8975
  • Loading branch information
davidpanderson committed Nov 28, 2005
1 parent ce4c2f0 commit 683ea5f
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 39 deletions.
5 changes: 5 additions & 0 deletions checkin_notes
Original file line number Diff line number Diff line change
Expand Up @@ -13994,3 +13994,8 @@ Janus 28 Nov 2005
/html/inc
forum.inc

David 27 Nov 2005
- pass core client version number in account manager RPC

client/
acct_mgr.C
9 changes: 8 additions & 1 deletion client/acct_mgr.C
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ int ACCT_MGR_OP::do_rpc(
strcpy(ami.login_name, name.c_str());
strcpy(ami.password, password.c_str());

sprintf(buf, "%srpc.php?name=%s&password=%s&host_cpid=%s", url.c_str(), name.c_str(), password.c_str(), gstate.host_info.host_cpid);
sprintf(buf,
"%srpc.php?name=%s&password=%s&host_cpid=%s&maj=%d&min=%d&rel=%d",
url.c_str(), name.c_str(), password.c_str(),
gstate.host_info.host_cpid,
gstate.core_client_major_version,
gstate.core_client_minor_version,
gstate.core_client_release
);
retval = gstate.gui_http.do_rpc(this, buf, ACCT_MGR_REPLY_FILENAME);
if (retval) {
error_num = retval;
Expand Down
10 changes: 5 additions & 5 deletions client/gui_rpc_server.C
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ int GUI_RPC_CONN_SET::init() {

addr.sin_family = AF_INET;

// On Windows our primary listening socket might be in use and Windows will
// still allow us to open up a listening socket on it. To avoid possible
// connection errors with the manager we'll attempt to connect to the port
// first to see if anybody is listening, if so we'll use the alternate port
// instead.
// On Windows our primary port might be in use and Windows will
// still allow us to bind it to a listening socket (huh????)
// So to connect to the port first to see if anybody is listening,
// if so use the alternate port instead.
//
if (is_primary_port_available()) {
addr.sin_port = htons(GUI_RPC_PORT);
} else {
Expand Down
17 changes: 13 additions & 4 deletions doc/acct_mgt.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@
list_item("input", "name
<br>password
<br> [ host_cpid ]
<br> [ maj ]
<br> [ min ]
<br> [ rel ]
"
);
list_item("output",
Expand All @@ -125,21 +128,27 @@
<account>
<url>URL</url>
<authenticator>KEY</authenticator>
[ suspend ]
[ <suspend/> ]
</account>
...
]
</acct_mgr_reply>")
);
list_item("action",
"Returns a list of the accounts associated with this meta-account.
The 'host_cpid' argment identifies the host.
The 'host_cpid' argument identifies the host.
To make it comparable with the host CPID in stats files,
do MD5(host_cpid+email_addr).
The maj, min and rel arguments identify the client's version.
<p>
Optionally returns a command to set the run mode (always, auto, or never),
commands to suspend individual projects,
and a time interval after which another RPC should be done.
These have the same function as the
'Run always', 'Run based on preferences',
and 'Suspend' commands in the BOINC manager.
<p>
Optionally returns commands to suspend individual projects.
<p>
Optionally returns a time interval after which another RPC should be done.
<p>
NOTE: the XML must be as above, with the &lt;url>
and &lt;authenticator> elements on a single line,
Expand Down
3 changes: 3 additions & 0 deletions doc/links.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ function site($url, $name) {
site("http://www.setihome.dk", "www.setihome.dk")
));
language("Dutch", array(
site("http://www.dutchpowercows.org/", "Dutch Power Cows
</a>(also <a href=http://gathering.tweakers.net/forum/list_topics/5>forums</a>)"
),
site("http://www.seti.nl/content.php?c=boincmain",
"SETI@Netherlands"
),
Expand Down
29 changes: 0 additions & 29 deletions doc/menubar.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,35 +228,6 @@
<p>Click &quot;OK&quot; to save
<h1>Acknowledgements and Support</h1>
<p>
BOINC Menubar was developed by
<a href=http://www.greenkeepersoftware.com>GreenKeeper Software</a>,
which has made BOINC Menubar freely available for all BOINC participants.
If you wish, you can make a
<a href=http://www.greenkeepersoftware.com/donate.html>donation</a>
to GreenKeeper Software to support further development of BOINC Menubar
and future GreenKeeper Software products.
<p>
If you have questions about, problems with, or comments concerning
BOINC Menubar, please contact GreenKeeper Software directly by
email (<a href=mailto:developer@greenkeepersoftware.com>support@greenkeepersoftware.com</a>).
If you are reporting a bug, please be as specific as possible.
<p>
Also, please be aware that some problems may be a result of BOINC or
projects running on the BOINC platform and not BOINC Menubar itself.
If you are unsure of the source of the problem,
go ahead and contact GreenKeeper Software anyway and we will do
our very best to help you or refer you to people who can.
<p>
<em><strong>Disclaimer:</strong></em> Every effort has been made on the part
of GreenKeeper Software to fully test and debug BOINC Menubar.
It should, therefore, not cause you to have any problems.
However, you are using BOINC Menubar at your own risk.
Any harm caused as a result of this software is not the fault of
GreenKeeper Software or the BOINC developers.
";

page_tail();
Expand Down

0 comments on commit 683ea5f

Please sign in to comment.