dbs [Thu, 8 Nov 2007 20:39:18 +0000 (20:39 +0000)]
And let's not double-log messages. Sigh.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1126
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Thu, 8 Nov 2007 20:36:16 +0000 (20:36 +0000)]
Format the date and time with leading zeroes to be easy on the eyes, and easier to parse.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1125
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Tue, 6 Nov 2007 22:45:19 +0000 (22:45 +0000)]
Correct name of prototype for osrf_message_get_last_locale()
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1124
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Tue, 6 Nov 2007 19:33:49 +0000 (19:33 +0000)]
Enable srfsh.py to load with the standard .srfsh.xml (no plugins)
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1123
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Tue, 6 Nov 2007 14:40:08 +0000 (14:40 +0000)]
make the perl local support match the C version
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1122
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Sun, 4 Nov 2007 11:38:50 +0000 (11:38 +0000)]
Avoid an "undefined variable" Perl warning when we receive no parameters.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1120
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Sat, 3 Nov 2007 17:52:29 +0000 (17:52 +0000)]
Convert a few routine log messages from error to info level.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1119
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Tue, 30 Oct 2007 22:26:11 +0000 (22:26 +0000)]
Make Logger a little more robust by setting a default loglevel
and ensuring that we don't try to regex an undefined value.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1118
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Mon, 29 Oct 2007 12:23:31 +0000 (12:23 +0000)]
fixed infinite loop bug by hopping out of the loop if timeout gets down to 0, but the code still allows the the loop to occur once if timeout is initially 0
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1117
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sat, 27 Oct 2007 01:48:03 +0000 (01:48 +0000)]
Patch from Scott McKellar to provide more const correctness to functions using osrfJSON objects
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1116
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Thu, 25 Oct 2007 15:50:39 +0000 (15:50 +0000)]
Add a top-level javascript-install target
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1115
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Thu, 25 Oct 2007 12:20:16 +0000 (12:20 +0000)]
Patch from Scott McKellar to increase const correctness in the JSON parser.
Also made the top level legacy_jsonParseString[Fmt] API const-correct, though this is removed within those wrapper calls to avoid potentially breaking the legacy code.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1114
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Thu, 25 Oct 2007 12:04:05 +0000 (12:04 +0000)]
Patch from Scott McKellar to clean up some const qualification and initialize a pointer to NULL.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1113
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Tue, 23 Oct 2007 15:36:45 +0000 (15:36 +0000)]
added new constructor to build from class hints
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1112
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 19 Oct 2007 23:43:59 +0000 (23:43 +0000)]
Patches from Scott McKellar covering:
1. Eliminating a const-removing cast from jsonObjectToJSON(). This
cast is no longer necessary now that a recent patch has changed the
signature of jsonObjectEncodeClass().
2. Moving the JSON_INIT_CLEAR macro out of the header file and into
the implementation file. No other file invokes this macro -- nor
could it, since the macro refers to two static functions within
osrf_json_object.c. Strictly speaking another file could provide
other functions with the same signatures, but I doubt that any such
usage was ever intended.
3. Adds some sanity checking to prevent undefined behavior when
a floating point payload is not representable as an int.
4. Streamlines the serialization of hashes and arrays by
eliminating a layer of allocation and deallocation.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1111
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Thu, 18 Oct 2007 03:08:38 +0000 (03:08 +0000)]
Deliberately break applications relying on pre-OpenSRF 1.0 behaviour.
JSON_v0.js represents "legacy" JSON format, while JSON_v1.js represents "modern" JSON format.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1110
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Thu, 18 Oct 2007 02:38:51 +0000 (02:38 +0000)]
Start installing the Python libraries as well.
Destination directory is named python25 because
Python3000 is just around the corner...
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1109
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 18 Oct 2007 02:22:22 +0000 (02:22 +0000)]
returning explicit true/false on data received
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1108
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Thu, 18 Oct 2007 01:11:10 +0000 (01:11 +0000)]
Install the JavaScript libraries into an OpenSRF library,
in prepration for OpenSRF applications being able to use
one known good JavaScript library for OpenSRF communication.
(I'm looking at you, EG, and your two copies of JSON.js)
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1107
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Tue, 16 Oct 2007 03:58:05 +0000 (03:58 +0000)]
I'm pretty sure we want $log here, as in all the other calls.
Perhaps we can get rid of the $logger import in the header?
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1106
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Wed, 10 Oct 2007 21:51:18 +0000 (21:51 +0000)]
Enable -l flag to work without an argument
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1105
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Wed, 10 Oct 2007 20:58:39 +0000 (20:58 +0000)]
More typos, as I read through logs.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1104
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Wed, 10 Oct 2007 20:38:14 +0000 (20:38 +0000)]
adding -l for localhost support
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1103
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Wed, 10 Oct 2007 20:10:19 +0000 (20:10 +0000)]
Add -D_LARGEFILE64_SOURCE flag to CGLAGS to avoid compile problems on 32-bit platforms.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1102
9efc2488-bf62-4759-914b-
345cdb29e865
dbs [Wed, 10 Oct 2007 18:47:42 +0000 (18:47 +0000)]
Fix some typos found while trying to improve osrf error messages.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1101
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 5 Oct 2007 20:24:09 +0000 (20:24 +0000)]
provide a warning-level default logger if none is defined
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1100
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Mon, 1 Oct 2007 02:47:44 +0000 (02:47 +0000)]
Patch that:
1) Creates safe_calloc, suggested by Scott McKellar which includes
memset, as calloc does. safe_malloc will eventually lose its call
to memset.
2) Creates a macro in utils.h called osrf_clearbuf which
* under CLFAGS=-DNDEBUG fills the buffer with !s and a trailing nul
* otherwise (currently) uses memset to fill with nuls
The secondary behavior should be changed to a no-op after no more
problems arise under NDEBUG mode. I reversed the suggested semantics
because I'm not ready to completely break trunk. To break everything
(AKA find where we should be providing a terminal nul) just compile
like this:
$ CLFAGS=-DNDEBUG make clean all
3) replaces all memsets (excepting the ones in safe_?alloc) that act
on char bufs with said macro, so they can be spotted and improved to
deal with nul terminators where needed. I didn't touch any memsets on
struct pointers.
4) made jid_get_*() from src/libopensrf/transport_message.c safe for
use with NDEBUG mode. They were depending on the target buffer that
the caller passes in to be nul-filled (they use strncpy/memcpy which
don't guarantee terminal nul) -- now they provide their own terminal
nul.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1099
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 30 Sep 2007 19:14:26 +0000 (19:14 +0000)]
Broad patch from Dan Scott to move towards better memory management:
* bzero->memset (with sizeof) - except when followed immediately by
snprintf(), in which case the call was deleted completely
* sprintf->snprintf (with sizeof) - for the C99-guaranteed
null-terminated string and avoidance of overwrites
* fgets (with sizeof) - because in at least one case "len - 1" was
being used for the length, even though fgets is defined to retrieve 1
byte less than the requested length - so the code was effectively
retrieving 2 bytes less than the allocated buffer
* in 2 places in srfsh.c, increased buffer size by 1 to allow for
null terminator
* various typo fixes
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1098
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 30 Sep 2007 18:53:17 +0000 (18:53 +0000)]
Patch from Dan Scott to:
1) fix typos and output alignment
2) include _LARGEFILE64_SOURCE in the makefile to make 32b linux happy
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1097
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 30 Sep 2007 17:56:45 +0000 (17:56 +0000)]
Use of const-correct osrfObjectGetKeyConst() from Scott McKellar:
1. It replaces jsonObjectGetKey() with jsonObjectGetKeyConst().
2. It uses const pointers, instead of non-const pointers, to capture
the return values of jsonObjectGetIndex() and jsonObjectGetString().
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1096
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 30 Sep 2007 17:54:25 +0000 (17:54 +0000)]
Continued const-correctness improvement from Scott McKellar:
1. I changed the signature of jsonObjectDecodeClass so that it accepts
a non-const pointer parameter. Since it doesn't change the contents
of the jsonObject, there's no need to confine it to non-const
jsonObjects.
2. I replaced jsonObjectGetKey() with jsonObjectGetKeyConst().
3. In one spot I captured the return value of jsonObjectGetIndex()
with a const pointer instead of a non-const pointer.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1095
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 30 Sep 2007 17:48:32 +0000 (17:48 +0000)]
Patch from Scott McKellar to improve const-correctness in srfsh:
This patch sprinkles a few const qualifiers over srfsh.c, and also
fixes a couple of things I stumbled across along the way.
The main purpose is to treat jsonObjects in a more const-correct
manner. I introduced a new jsonObjectGetKeyConst function, and I
prepared for the day when jsonObjectGetString() returns a const
pointer instead of a non-const pointer.
This patch relies on a previous patch that defines the new
jsonObjectGetKeyConst function.
1. In handle_login() I changed hash to a const pointer, so that we
can assign the return value of jsonObjectGetString() to it.
2. Later in the same function, I rearranged the code a bit to ensure
that we always free a prior value of login_session before giving it
a new value. The original code potentially leaks memory.
3. In the same area I changed authtoken to a const pointer.
4. In send_request() I eliminated an unnecessary test for the
non-nullness of omsg->_result_content, because we had just tested
it a few lines ago.
5. Also in send_request(): I introduced a layer of strdup() when
we get content from jsonObjectGetString(). This change concerns
more than just const-correctness.
The problem with the original code is that we get content sometimes
from jsonFormatString() and sometimes from jsonObjectGetString().
The former returns a malloc'ed buffer, which we need to free. The
latter returns a pointer to a buffer owned by a jsonObject, and we
should not free it. As it happens, we do free it. If we got the
string from jsonObjectGetString(), then we leave the jsonObject with
an invalid pointer inside it. If we free the jsonObject later, we'll
try to free that same buffer a second time. Oops.
Another issue is that jsonObjectGetString() can return NULL, which
we should handle more carefully.
These problems occur in two different places in the same function.
I fixed them both the same way, with some differences in the details.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1094
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 30 Sep 2007 14:03:19 +0000 (14:03 +0000)]
Patch from Scott McKellar which introduces a const-accepting and -returning
version of jsonObjectGetKey. This is the first step in a plan to push
const-correctness on the OpenSRF stack when dealing with complex objects. The
hope is that this will increase the utility of compile-time checks in new
client code.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1093
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Wed, 26 Sep 2007 15:17:36 +0000 (15:17 +0000)]
added some more rigorous checking of session connected-ness and some logging
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1092
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Mon, 24 Sep 2007 02:43:04 +0000 (02:43 +0000)]
repaired logic bug which left the parser state in the JSON_STATE_IN_KEY
state after exiting from an empty JSON object.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1091
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 21 Sep 2007 16:12:07 +0000 (16:12 +0000)]
added cache cleanup code
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1090
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 2 Sep 2007 17:36:15 +0000 (17:36 +0000)]
Patch from Scott McKellar to log service name on child process startup and exit, along with more exit status info
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1089
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 30 Aug 2007 18:56:46 +0000 (18:56 +0000)]
added an atomic method for simple, one-off calls
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1088
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Tue, 28 Aug 2007 00:29:22 +0000 (00:29 +0000)]
patch from Scott McKellar to examine and report the exit status of child processes as they shut down
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1087
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Tue, 28 Aug 2007 00:28:22 +0000 (00:28 +0000)]
patch from Scott McKellar to use const pointer qualification during object serialization
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1086
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sun, 19 Aug 2007 13:54:43 +0000 (13:54 +0000)]
adding thread name to the log output
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1085
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sun, 19 Aug 2007 13:52:25 +0000 (13:52 +0000)]
safer extraction of data from the in-memory object
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1084
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sun, 19 Aug 2007 12:59:36 +0000 (12:59 +0000)]
fixed import statement
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1083
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sun, 19 Aug 2007 01:33:21 +0000 (01:33 +0000)]
not creating new handle if the current thread already has one. changed resource layout
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1082
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sun, 19 Aug 2007 01:16:02 +0000 (01:16 +0000)]
added support for multi-threaded client interactions. much like the java lib, each thread is allowed 1 jabber connection, as opposed to 1 process-wide jabber connection. also did some re-tabbing to force 4-space tabs (not raw tabs) - more of those to come
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1081
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 17 Aug 2007 21:57:31 +0000 (21:57 +0000)]
updated to work with opensrf.jar with doing 'make run'
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1080
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 17 Aug 2007 21:57:16 +0000 (21:57 +0000)]
added multi-threaded client support to the opensrf network/xmpp layer
this is all managed below the covers so that clients can continue to safely
use bootstrapClient and will all "just work"
we now allow 1 xmpp connection per thread, as opposed to 1 per process.
added a test module
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1079
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 17 Aug 2007 21:50:01 +0000 (21:50 +0000)]
minor layout change. calling notifyAll to ensure all threads are notified
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1078
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Tue, 14 Aug 2007 19:08:38 +0000 (19:08 +0000)]
for now, we reference the wstx stax implementation directly to resolve class loader issues
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1077
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Tue, 7 Aug 2007 15:28:44 +0000 (15:28 +0000)]
Patch from Scott McKellar to protect SHA-1 against an off-by-one bug
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1076
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Tue, 7 Aug 2007 15:15:08 +0000 (15:15 +0000)]
Patch from Dan Scott to remove mentions of open-ils from the example config file
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1075
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 3 Aug 2007 19:31:12 +0000 (19:31 +0000)]
adding new JSON parsing JS code, for wrapped class objects
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1074
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 3 Aug 2007 15:49:27 +0000 (15:49 +0000)]
adding basic logging api with a filelogger version and a test module
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1073
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 3 Aug 2007 02:57:57 +0000 (02:57 +0000)]
more locale cleanup
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1072
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 3 Aug 2007 02:30:45 +0000 (02:30 +0000)]
un-crazy-fy current_locale
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1071
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 3 Aug 2007 02:20:56 +0000 (02:20 +0000)]
formatting ... they are all tabs! ;)
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1070
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 3 Aug 2007 02:19:32 +0000 (02:19 +0000)]
arg ... left out one minor fix
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1069
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 3 Aug 2007 02:19:02 +0000 (02:19 +0000)]
formatting fixes; protect against NULL apache setting
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1068
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Thu, 2 Aug 2007 03:03:35 +0000 (03:03 +0000)]
unbreaking the perl session locale stuff
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1067
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Thu, 2 Aug 2007 02:49:53 +0000 (02:49 +0000)]
initial sender_locale support ... probably going to break stuff; also, patch from Scott McKellar to define some undefined behavior in an snprintf call
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1066
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Wed, 1 Aug 2007 14:40:39 +0000 (14:40 +0000)]
Patch from Scott McKellar to provide defined behavior when passing NULL to an sprintf
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1065
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sat, 28 Jul 2007 17:41:32 +0000 (17:41 +0000)]
synchronizing the initial xmpp login to prevent thread race condition on authentication
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1064
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sat, 28 Jul 2007 17:38:26 +0000 (17:38 +0000)]
added shutdown call to cleanly disconnect from the opensrf network
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1063
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sat, 28 Jul 2007 15:32:18 +0000 (15:32 +0000)]
re-factored and cleaned up the registered class base-class object
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1062
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 26 Jul 2007 20:31:41 +0000 (20:31 +0000)]
making sure error logs are logged to stderr even if syslogging is not an option -- eventually, it should fall back to stderr logging like the C code does
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1061
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 26 Jul 2007 20:30:52 +0000 (20:30 +0000)]
added a try/catch around the XML parsing and an error log
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1060
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 26 Jul 2007 20:30:16 +0000 (20:30 +0000)]
python only evaluates default function param values once, so mutable types will always be pointers to the original default val. change the default osrfNetworkObject init function to None and setting default manually
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1059
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Tue, 24 Jul 2007 01:48:09 +0000 (01:48 +0000)]
Patch from Scott McKellar to address potential buffer overflow in router query inside srfsh.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1058
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Mon, 23 Jul 2007 17:44:46 +0000 (17:44 +0000)]
Patch from Scott McKellar providing:
1. In handle_print(), I added the ability to display the value of
raw_print. If we can display pretty_print, we should be able to
display raw_print.
2. In a couple of places we display the value of login_session.
However if we aren't logged in, we end up passing NULL to printf(),
thereby invoking undefined behavior. Apparently glibc responds by
printing "(null)". I contrived explicitly to print "(none)" rather
than rely on glibc.
3. Since login_session is assigned from strdup() if not NULL, I added
a free() for it in a couple of places: one at the end of main(), and
one just before the assignment from strdup().
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1057
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sun, 22 Jul 2007 22:06:49 +0000 (22:06 +0000)]
added JSON gateway support
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1056
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sat, 21 Jul 2007 20:50:19 +0000 (20:50 +0000)]
added a bunch of comments to the test client to help explain the api
made the makefile 'run' command more verbose
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1055
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sat, 21 Jul 2007 20:46:08 +0000 (20:46 +0000)]
ressurrected the srfsh time command
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1054
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sat, 21 Jul 2007 20:31:30 +0000 (20:31 +0000)]
Patch from Scott McKellar to fill buffer overflow holes:
The first overflow can happen with an excessively long username.
The second overflow is more doubtful, because the inputs come from
two other functions. It's not obvious whether an overflow is possible
or not. It may be that those functions will never return strings long
enough to overflow. However it is easier to assume that they might,
and avoid the overflow for sure, than to determine whether an overflow
is possible in the first place.
In each case I declared a variable-length character array with a
calculated length.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1053
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sat, 21 Jul 2007 18:59:31 +0000 (18:59 +0000)]
Patch from Ed Summers:
Attached is a minor patch to OpenSRF/src/java/Makefile for creating a
opensrf.jar. I was thinking an opensrf.jar would make it easy to
deploy OpenSRF client in a Woodchip/OpenTaps instance. It's not yet
clear to me what the build environment is (or will be) for
Woodchip--but .jar files are used to across the board to manage
external dependencies in Javaland.
- - -
I've also given the depencies their own vars for easier handling and
made the dependency fetching smarter to prevent re-fetching existing deps
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1052
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Fri, 20 Jul 2007 12:58:59 +0000 (12:58 +0000)]
Merging changes from branches/new-json2
svn merge -r1006:1012 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1018:1019 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1022:1025 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1026:1028 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1036:1037 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1039:1040 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1041:1043 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1045:1048 svn://svn.open-ils.org/OpenSRF/branches/new-json2
This moves OpenSRF to the new JSON wire protocol,
including:
a new C parser
a new osrfList based string_array module
a compatibility layer for mimicking libobjson and legacy JSON I/O in the HTTP gateway
a small JSON test program for profiling, etc.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1051
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Wed, 18 Jul 2007 22:27:04 +0000 (22:27 +0000)]
fixed bug in json encoding of hinted objects and some display bugs
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1049
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Tue, 17 Jul 2007 14:07:43 +0000 (14:07 +0000)]
added config contexts for config files. fixed some osrfNetworkObject handling bugs. did some re-tabbing to change to space-based tabs
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1041
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Mon, 16 Jul 2007 13:03:48 +0000 (13:03 +0000)]
Patch from Scott McKellar to repair srfsh buffer overflow:
The potential overflow occurs in handle_introspection(), which in the
existing code uses sprintf() to insert some user-supplied input into a
fixed length buffer, without checking the length of the user-supplied
input.
There's always more than one way to fix this sort of thing. For
example I could have formatted into a growing_buffer. Instead, I
chose to calculate the necessary buffer size and then declare a
variable-length buffer. That way I avoid two mallocs and two frees.
I tested this change by inserting some temporary printfs to capture
the commands being sent to parse_request(). The outputs before and
after the change were identical.
There's at least one more such potential overflow that I haven't
addressed yet. It's near the top of handle_login(), where we
use sprintf() to insert a username into a fixed length buffer.
There may be others that I haven't noticed yet.
Scott McKellar
http://home.swbell.net/mck9/ct/
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1038
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 15 Jul 2007 02:18:41 +0000 (02:18 +0000)]
Patch from Scott McKellar to clean up srfsh's user interface:
1. srfsh exits the main loop in two circumstances. The first is when
it sees the "quit" or "exit" command. The second is when it sees
end-of-file, either because it reads the end of a script or because
the user enters the associated keystrokes (typically Control-D).
In the case of end-of-file, srfsh exits without issuing another
newline. As a result, the next shell prompt shows up concatenated
to the srfsh prompt. This result is harmless but annoying.
I tweaked the code to detect this situation and issue an extra
newline, so that the next shell prompt show up on a line by itself.
2. I strip off leading whitespace before processing the input
command.
As a result, srfsh will now recognize "quit", "exit", or a leading
exclamation point, even when preceded by whitespace. Other commands
are not affected because strtok() already strips off leading
blanks. Tab characters don't matter because readline() removes them.
3. I also strip off trailing whitespace. This measure affects only
the "quit" and "exit" commands.
4. I ignore input lines whose first non-whitespace character is an
octothorpe ('#', also known as hash, pound, or tic-tac-toe). In
other words, scripts can now have comments.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1035
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 13 Jul 2007 14:52:20 +0000 (14:52 +0000)]
changing back to an array, from calloc. more straight-forward, and avoids memset overhead
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1031
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 13 Jul 2007 03:15:51 +0000 (03:15 +0000)]
Patch from Scott McKellar, with modifications, to remove unused code and provide some memory protection:
This patch contains one minor change and one less minor change.
--------
The less minor change is the elimination of some old code that once
opened a pipe to send commands to bash. According to Bill Erickson
in a private email, that code is a leftover remnant from an
experiment and may be removed.
Before a patch was applied several days ago, things worked like this:
IF you compiled srfsh with a certain macro #defined, AND you entered
a command that was invalid to srfsh, THEN srfsh would pipe the
command to bash for execution.
It is doubtful that anyone but Bill ever used this variation, but if
anyone wants to keep it around, then this is his or her chance to
protest. Before protesting, however, please note that the shell
escape mechanism now provides shell-like command processing. I.e.
if you start the srfsh command line with an exclamation point, srfsh
passes the rest of the command to the default shell (normally
/bin/sh) for execution. The command so passed can use environmental
variables, pipes, IO redirection, wild card expansion, and most of
the sorts of things you're used to from the shell command line.
Note that not all shells behave the same. If you're used to using
tcsh as your shell, for example, you may find that sh won't work
quite the same way. For now, at least, that's just too bad, but
that's the way shell escapes typically work.
It is probably possible to invoke the user's default shell as
identified by the environmental variable $SHELL. However that
nicety would not be trivial to code.
----------
The minor change is that, after building an array of pointers
pointing to tokens from the input command, I set the next
pointer to NULL so that it mark the end of the token list.
(miker: I changed to calloc/free instead of an array, but left the final
NULL in place.)
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1030
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 12 Jul 2007 18:21:22 +0000 (18:21 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1003" from
svn://svn.open-ils.org/OpenSRF/branches/new-json2
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1029
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Wed, 11 Jul 2007 03:17:13 +0000 (03:17 +0000)]
Patch from Scott McKellar to fix potential local buffer
overflow attack against srfsh:
This patch fixes a potential buffer overflow in the parse_error
function. The existing code concatenates the strtoked tokens into a
fixed-length buffer, with no check for overflow. It isn't hard to
build an srfsh command that overflows the buffer, with baleful
results.
While it's not likely that anyone would do so by accident from the
command line, an srfsh script might well do so, especially if the
script were generated from another program.
More important, someone sufficiently clever might be able to use
such an overflow to work mischief.
My version of parse_error() uses a growing_buffer to accumulate
the tokens.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1022
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Mon, 9 Jul 2007 13:08:34 +0000 (13:08 +0000)]
Patch from Scott McKellar to remove srfsh.h and push all relevant
delarations into the implementation file, with some additional cleanup
to remove "declared by not used" warnings:
1. We have no further use for the header file. Accordingly I
include a patch to the Makefile, removing a dependency on the header.
2. I declared as static everything that was formerly in the header,
plus a few variables that were already defined in srfsh.c.
3. I commented out the shell_reader variable, since it is no longer
used.
4. I commented out two of the lines printed by the help command.
These lines refer to the "time" command, which srfsh no longer
supports.
5. I commented out the prototype for the handle_time function, since
the function itself is already commented out.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1018
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Sun, 8 Jul 2007 17:51:11 +0000 (17:51 +0000)]
repaired conflicting declarations
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1015
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Sun, 8 Jul 2007 17:40:23 +0000 (17:40 +0000)]
Patch from Scott McKellar for declaration cleanup and improved error handling:
1. I added the const qualifier to several function parameters.
2. I replaced inet_addr() with inet_aton().
According to the man page, inet_addr() is obsolete. It reports an
error by returning -1, which however is a valid IP address
(255.255.255.255). inet_aton reports errors in a more robust way.
3. I check the return value from inet_aton(). If the input address is
invalid, I log a message and return -1.
Without such a check, an invalid listener address leads to a server
that is completely unresponsive. The user has no way to know what's
wrong unless he spots the mistake himself in the relevant
configuration file.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1013
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 6 Jul 2007 16:56:32 +0000 (16:56 +0000)]
adding COPYING and LICENSE.txt
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1006
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 6 Jul 2007 12:29:52 +0000 (12:29 +0000)]
a little bit more cleanup from previous DOM/DomianObject removal
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1002
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Fri, 6 Jul 2007 00:20:44 +0000 (00:20 +0000)]
moved from custom is_number() to standared ctype.h isdigit()
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1001
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 5 Jul 2007 20:45:36 +0000 (20:45 +0000)]
reformated error for easier reading
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1000
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Thu, 5 Jul 2007 17:58:49 +0000 (17:58 +0000)]
removing signedness warnings coming from libxml2
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@999
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 5 Jul 2007 16:00:42 +0000 (16:00 +0000)]
fixed bug where no-text-data resulted in incorrect array index when parsing hinted objects
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@998
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 5 Jul 2007 14:53:24 +0000 (14:53 +0000)]
fixed bug in to-json logic -- was still using older api
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@997
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Thu, 5 Jul 2007 12:22:45 +0000 (12:22 +0000)]
removed some initial (non-error) stderr logging.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@996
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Thu, 5 Jul 2007 00:14:18 +0000 (00:14 +0000)]
need to wait for perl to catch up ...
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@995
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Thu, 5 Jul 2007 00:02:42 +0000 (00:02 +0000)]
capture the perl pid using ps instead of $! (forking for daemonization)
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@994
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Wed, 4 Jul 2007 23:48:21 +0000 (23:48 +0000)]
do the process separation dance on server bootstrapping, just like with the C code
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@993
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Wed, 4 Jul 2007 20:08:15 +0000 (20:08 +0000)]
removing vestigial DOM code from back when opensrf talked XML
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@992
9efc2488-bf62-4759-914b-
345cdb29e865
erickson [Mon, 2 Jul 2007 22:07:02 +0000 (22:07 +0000)]
updated the sylog and activity log file handling to accomodate differences from bootstrap.conf and opensrf_core.xml
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@991
9efc2488-bf62-4759-914b-
345cdb29e865
miker [Mon, 2 Jul 2007 15:14:02 +0000 (15:14 +0000)]
Completing the JSON perl module move started by patch from Dan Scott.
git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@990
9efc2488-bf62-4759-914b-
345cdb29e865