From e2b5be008058502c169d27198a5c473a5398c8f5 Mon Sep 17 00:00:00 2001 From: Karl Chen Date: Fri, 25 Jul 2003 20:48:29 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=1810 --- configure | 26 +++++++++++++------------- configure.ac | 2 +- sched/handle_request.C | 24 +++++++++++++++--------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/configure b/configure index 22fb2cc7b0..22b91a040f 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.18 . +# From configure.ac Revision: 1.21 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for BOINC 1.07. +# Generated by GNU Autoconf 2.57 for BOINC 1.08. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -288,8 +288,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='BOINC' PACKAGE_TARNAME='boinc' -PACKAGE_VERSION='1.07' -PACKAGE_STRING='BOINC 1.07' +PACKAGE_VERSION='1.08' +PACKAGE_STRING='BOINC 1.08' PACKAGE_BUGREPORT='' ac_unique_file="lib/shmem.C" @@ -811,7 +811,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures BOINC 1.07 to adapt to many kinds of systems. +\`configure' configures BOINC 1.08 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -878,7 +878,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of BOINC 1.07:";; + short | recursive ) echo "Configuration of BOINC 1.08:";; esac cat <<\_ACEOF @@ -968,7 +968,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -BOINC configure 1.07 +BOINC configure 1.08 generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1004,7 +1004,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by BOINC $as_me 1.07, which was +It was created by BOINC $as_me 1.08, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1697,7 +1697,7 @@ fi # Define the identity of the package. PACKAGE='boinc' - VERSION='1.07' + VERSION='1.08' cat >>confdefs.h <<_ACEOF @@ -1830,9 +1830,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -MAJOR_VERSION=`echo 1.07 | sed 's/\..*//'` +MAJOR_VERSION=`echo 1.08 | sed 's/\..*//'` -MINOR_VERSION=`echo 1.07 | sed 's/.*\.//'` +MINOR_VERSION=`echo 1.08 | sed 's/.*\.//'` @@ -7014,7 +7014,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by BOINC $as_me 1.07, which was +This file was extended by BOINC $as_me 1.08, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7077,7 +7077,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -BOINC config.status 1.07 +BOINC config.status 1.08 configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 4db27c7934..e86a660435 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl not sure exactly what the minimum version is (but 2.13 won't work) AC_PREREQ(2.57) dnl Process this file with autoconf to produce a configure script. -AC_INIT(BOINC, 1.07) +AC_INIT(BOINC, 1.08) AC_CANONICAL_SYSTEM diff --git a/sched/handle_request.C b/sched/handle_request.C index cdb323f1e2..d3f1306153 100644 --- a/sched/handle_request.C +++ b/sched/handle_request.C @@ -475,8 +475,6 @@ int handle_results( for (i=0; iclient_version_num = - sreq.core_client_major_version*100 + sreq.core_client_minor_version; // acknowledge the result even if we couldn't find it -- // don't want it to keep coming back @@ -570,6 +568,8 @@ int handle_results( strncpy(result.stderr_out, rp->stderr_out, sizeof(result.stderr_out)); strncpy(result.xml_doc_out, rp->xml_doc_out, sizeof(result.xml_doc_out)); + result.client_version_num = + sreq.core_client_major_version*100 + sreq.core_client_minor_version; retval = result.update(); if (retval) { log_messages.printf( @@ -760,6 +760,11 @@ bool wrong_major_version(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) { return false; } +inline static const char* get_remote_addr() +{ + return getenv("REMOTE_ADDR"); +} + void process_request( SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply, SCHED_SHMEM& ss, char* code_sign_key @@ -789,6 +794,14 @@ void process_request( return; } + log_messages.printf( + SchedMessages::NORMAL, "Processing request from [USER#%d] [HOST#%d] [IP %s] [RPC#%d] core client version %d.%02d\n", + reply.user.id, reply.user.id, + get_remote_addr(), + sreq.rpc_seqno, + sreq.core_client_major_version, sreq.core_client_minor_version + ); + ++log_messages; handle_global_prefs(sreq, reply); handle_results(sreq, reply, reply.host); @@ -798,11 +811,6 @@ void process_request( send_code_sign_key(sreq, reply, code_sign_key); } -inline static const char* get_remote_addr() -{ - return getenv("REMOTE_ADDR"); -} - void handle_request( FILE* fin, FILE* fout, SCHED_SHMEM& ss, char* code_sign_key ) { @@ -813,10 +821,8 @@ void handle_request( SchedMessages::NORMAL, "Handling request from %s\n", get_remote_addr() ); - ++log_messages; memset(&sreq, 0, sizeof(sreq)); sreq.parse(fin); process_request(sreq, sreply, ss, code_sign_key); sreply.write(fout); - --log_messages; }