4bcbdc54c9
This switches the Metasploit Framework to a Rails 3 backend. If you run into new problems (especially around Active Record or your postgresql gem) you should try first updating your Ruby installation to 1.9.3 and use a more recent 'pg' gem. If that fails, we'd love to see your bug report (just drop all the detail you can into an issue on GitHub). In the meantime, you can checkout the rails2 branch, which was branched from master immediately before this cutover. Squashed commit of the following: commit 5802ec851580341c6717dfea529027c12678d35f Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 23:30:12 2012 -0500 Enable MSF_BUNDLE_GEMS mode by default (set to N/F/0 to disable) commit 8102f98dce9eb0c73c4374e40dce09af7b51d060 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 23:30:03 2012 -0500 Add a method to expand win32 file paths commit bda6479d154cf75572dd5de8b66bfde661a55de9 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:53:44 2012 -0500 Fix 1.8.x compatibility commit 101ce4eb17bfdf755ef8c0a5198174668b6cd6fd Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:40:59 2012 -0500 Use verbose instead of stringio commit 5db467ffb593488285576d183b1662093e454b3e Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:30:06 2012 -0500 Hide the iconv warning, were stuck with it due to EBCDIC support commit 63b9cb20eb6a61daf4effb4c8d2761c16ff0c4e0 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:29:58 2012 -0500 Dont use GEM_HOME by default commit ca49271c22c314a4465fff934334df18c704cbc0 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:23:34 2012 -0500 Move Gemfile to root (there be dragons, lets find them) and catch failed bundler loads commit 34af04076a068e9f60c5526045ddbba5fca359fd Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 18:18:29 2012 -0500 Fallback to bundler when not running inside of a installer env commit ed1066a4f3f12fae7d4afc03eb1ab70ffe2f9cf3 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 16:26:55 2012 -0500 Remove a mess of gems that were not actually required commit 21290a73926809e9049a59359449168f740d13d2 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 15:59:10 2012 -0500 Hack around a gem() call that is well-intentioned but an obstacle in this case commit 8e414a8bfab9641c81088d22f73033be5b37a700 Author: Tod Beardsley <todb@metasploit.com> Date: Sun Apr 15 15:06:08 2012 -0500 Ruby, come on. Ducktype this. Please. Use interpolated strings to get the to_s behavior you don't get with just plussing. commit 0fa92c58750f8f84edbecfaab72cd2da5062743f Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 15:05:42 2012 -0500 Add new eventmachine/thin gems commit 819d5e7d45e0a16741d3852df3ed110b4d7abc44 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 15:01:18 2012 -0500 Purge (reimport in a second) commit ea6f3f6c434537ca15b6c6674e31081e27ce7f86 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 14:54:42 2012 -0500 Cleanup uncessary .so files (ext vs lib) commit d219330a3cc563e9da9f01fade016c9ed8cda21c Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 14:53:02 2012 -0500 PG gems built against the older installation environment commit d6e590cfa331ae7b25313ff1471c6148a6b36f3b Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 14:06:35 2012 -0500 Rename to include the version commit a893de222b97ce1222a55324f1811b0262aae2d0 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 13:56:47 2012 -0500 Detect older installation environments and load the arch-lib directories into the search path commit 6444bba0a421921e2ebe2df2323277a586f9736f Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 13:49:25 2012 -0500 Merge in windows gems commit 95efbcfde220917bc7ee08e6083d7b383240d185 Author: Tod Beardsley <todb@metasploit.com> Date: Sun Apr 15 13:49:33 2012 -0500 Report_vuln shouldn't use :include in finder find_or_create_by doesn't take :include as a param. commit c5f99eb87f0874ef7d32fa42828841c9a714b787 Author: David Maloney <DMaloney@rapid7.com> Date: Sun Apr 15 12:44:09 2012 -0500 One more msised Mdm namespace issue commit 2184e2bbc3dd9b0993e8f21d2811a65a0c694d68 Author: David Maloney <DMaloney@rapid7.com> Date: Sun Apr 15 12:33:41 2012 -0500 Fixes some mroe Mdm namespace confusion Fixes #6626 commit 10cee17f391f398bb2be3409137ff7348c7a66ee Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 03:40:44 2012 -0500 Add robots gem (required by webscan) commit 327e674c83850101364c9cca8f8d16da1de3dfb5 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 03:39:05 2012 -0500 Fix missing error checks commit a5a24641866e47e611d7636a3f19ba3b3ed10ac5 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 01:15:37 2012 -0500 Reorder requires and add a method for injecting a new migration path commit 250a5fa5ae8cb05807af022aa4168907772c15f8 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 00:56:09 2012 -0500 Remove missing constant (use string) and add gemcache cleaner commit 37ad6063fce0a41dddedb857fa49aa2c4834a508 Merge: d47ee824be0361Author: Tod Beardsley <todb@metasploit.com> Date: Sun Apr 15 00:40:16 2012 -0500 Merge branch 'master-clone' into rails3-clone commit d47ee82ad7e66de53dd3d3a65649cc37299a2479 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 00:30:03 2012 -0500 cleanup leftovers from gems commit 6d883b5aa8a3a7ddbcde5bfd4521d57c5b30d3c2 Author: HD Moore <hd_moore@rapid7.com> Date: Sun Apr 15 00:25:47 2012 -0500 MDM update with purged DBSave module commit 71e4f2d81f6da221b76150562a16c730888f5925 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 23:19:37 2012 -0500 Add new mdm commit 651cd5adac8211d65e0c8079371d8264e549533a Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 23:19:13 2012 -0500 Update mdm commit 0191a8bd0acec30ddb2a9e9c291111a12378537f Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 22:30:40 2012 -0500 This fixes numerous cases of missed Mdm:: prefixes on db objects commit a2a9bb3f2148622c135663dead80b3367b6f7695 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 18:30:18 2012 -0500 Add eventmachine commit 301ddeb12b906ed3c508613ca894347bedc3b499 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 18:18:12 2012 -0500 A nicer error for folks who need to upgrade pg commit fa6bde1e67b12e2d3d9978f59bbc98e0c1a1a707 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 17:54:55 2012 -0500 Remove bundler requirements commit 2e3ab9ed211303f1116e602b9a450141b71e56a4 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 17:35:38 2012 -0500 Pull in eventmachine with actual .so's this time commit 901fb33ff6b754ce2c2cfd51e3b0b669f6ec600b Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 17:19:12 2012 -0500 Update deps, still need to add eventmachine commit 6b0e17068e8caa0601f3ef81e8dbdb672758fcbe Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 13:07:06 2012 -0500 Handle older installer environments and only allow binary gems when the environment specifically asks for it commit b98eb7873a6342834840424699caa414a5cb172a Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 04:05:13 2012 -0500 Bump version to -testing commit 6ac508c4ba3fdc278aaf8cfe2c58d01de3395431 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:25:09 2012 -0500 Remove msf3 subdir commit a27dac5067635a95b4cbb773df1985f2a2dc2c5a Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:24:39 2012 -0500 Remove the old busted external commit 5fb5a0fc642b6c301934c319db854cc3145427a1 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:03:10 2012 -0500 Add the gemcache loader commit 09e2d89dfd09b9ac0c123fcc4e19816c86725627 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Apr 14 02:02:23 2012 -0500 Purge gemfile/bundler configure in exchange for new gemcache setup commit 3cc0264e1cfb027b515d7f24b95a74b023bd905c Author: Tod Beardsley <todb@metasploit.com> Date: Thu Apr 12 14:11:45 2012 -0500 Mode change on modicon_ladder.apx commit c18b3d56efd639e461137acdc76b4b283fe978d4 Author: HD Moore <hd_moore@rapid7.com> Date: Thu Apr 12 01:38:56 2012 -0500 The go faster button commit ca2a67d51d6d4c7c3ca2e745f8b018279aef668a Merge: 674ee09b8129f9Author: Tod Beardsley <todb@metasploit.com> Date: Mon Apr 9 15:50:33 2012 -0500 Merge branch 'master-clone' into rails3-clone Picking up Packetfu upstream changes, all pretty minor commit 674ee097ab8a6bc9608bf377479ccd0b87e7302b Merge: e9513e5a26e844Author: Tod Beardsley <todb@metasploit.com> Date: Mon Apr 9 13:57:26 2012 -0500 Merge branch 'master-clone' into rails3-clone Conflicts: lib/msf/core/handler/reverse_http.rb lib/msf/core/handler/reverse_https.rb modules/auxiliary/scanner/discovery/udp_probe.rb modules/auxiliary/scanner/discovery/udp_sweep.rb Resolved conflicts with the reverse_http handlers and the udp probe / scanners byt favoring the more recent changes (which happened to be the intent anyway). The reverse_http and reverse_https changes were mine so I know what the intent was, and @dmaloney-r7 changed udp_probe and udp_sweep to use pcAnywhere_stat instead of merely pcAnywhere, so the intent is clear there as well. commit e9513e54f984fdb100c13b44a1724246779ccb76 Author: David Maloney <dmaloney@melodie.gateway.2wire.net> Date: Fri Apr 6 18:21:46 2012 -0500 Some fixes to how services get reported to prevent issues with the web interface commit adeb44e9aaf1a329a0e587d2b26e678398730422 Author: David Maloney <David_Maloney@rapid7.com> Date: Mon Apr 2 15:39:46 2012 -0500 Some corrections to pcAnywhere discovery modules to distinguish between the two services commit b13900176484fea8f5217a2ef925ae2ad9b7af47 Author: HD Moore <hd_moore@rapid7.com> Date: Sat Mar 31 12:03:21 2012 -0500 Enable additional migration-path parameters, use a temporary directory to bring the database online commit 526b4c56883f461417f71269404faef38639917c Author: David Maloney <David_Maloney@rapid7.com> Date: Wed Mar 28 23:24:56 2012 -0500 A bunch of Mdsm fixes for .kind_of? calls, to make sure we ponit to the right place commit 2cf3143370af808637d164ce59400605300f922c Author: HD Moore <hd_moore@rapid7.com> Date: Mon Mar 26 16:22:09 2012 -0500 Check for ruby 2.0 as well as 1.9 for encoding override commit 4d0f51b76d89f00f7acbce6b1f00dc6e4c4545ee Author: HD Moore <hd_moore@rapid7.com> Date: Mon Mar 26 15:36:04 2012 -0500 Remove debug statement commit f5d2335e7745aa1a354f4d6c8fc9d0b3876c472a Author: HD Moore <hd_moore@rapid7.com> Date: Mon Mar 26 15:01:55 2012 -0500 Be explicit about the Mdm namespace commit bc8be225606d6ea38dd2a85ab4310c1c181a94ee Author: hdm <hdm@hypo.(none)> Date: Mon Mar 26 11:49:51 2012 -0500 Precalculate some uri strings in case the 1000-round generation fails commit 4254f419723349ffb93e4aebdaeabbd7d66bf8c0 Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Sat Mar 24 14:03:44 2012 -0500 Removed some non-namespaced calls to Host commit c8190e1bb8ad365fb0d7a1c4a9173e6c739be85c Author: HD Moore <hd_moore@rapid7.com> Date: Tue Mar 20 00:37:00 2012 -0500 Purge the rvmrc, this is causing major headaches commit 76df18588917b7150a3bedf2569710a80bab51f8 Author: HD Moore <hd_moore@rapid7.com> Date: Tue Mar 20 00:31:52 2012 -0500 Switch .rvmrc to the shipping 1.9.3 version commit7124971d00Author: David Maloney <David_Maloney@rapid7.com> Date: Mon Mar 12 16:56:40 2012 -0500 Adds mixin for looking up Mime Types by extension commitb7ca835316Merge:a0b0c756b9a219Author: Matt Buck <techpeace@gmail.com> Date: Tue Mar 6 19:38:53 2012 -0600 Merge from develop. commita0b0c7528dAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Mar 6 11:08:59 2012 -0600 Somehow migration file is new? commit84d2b3cb1aAuthor: David Maloney <David_Maloney@rapid7.com> Date: Wed Feb 29 16:38:55 2012 -0600 Added ability to specify headers to redirects in http server commite50d27cda8Author: HD Moore <hd_moore@rapid7.com> Date: Sat Feb 4 04:44:50 2012 -0600 Tweak the event dispatcher to enable customer events without a category and trigger http request events from the main exploit mixin. Experimental commit0e4fd2040dAuthor: Matt Buck <Matthew_Buck@rapid7.com> Date: Thu Feb 2 22:09:05 2012 -0600 Change Msm -> Mdm in migrations. This is what was preventing migrations from finishing on first boot. commitc94a2961d0Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Wed Feb 1 12:48:48 2012 -0600 Changed Gemfile to use new gem name commit245c2063f0Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Wed Feb 1 12:47:42 2012 -0600 Did find/replace for final namespace of Mdm commit6ed9bf8430Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 24 10:47:44 2012 -0600 Fix a bunch of namespace issues commit2fe08d9e42Author: Matt Buck <Matthew_Buck@rapid7.com> Date: Fri Jan 20 14:37:37 2012 -0600 Update Msm contstants in migrations for initial DB builds. commit4cc6b8fb04Author: Matt Buck <Matthew_Buck@rapid7.com> Date: Fri Jan 20 14:37:25 2012 -0600 Update Gemfile.lock. commit1cc655b678Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Thu Jan 19 11:48:29 2012 -0600 Errant Workspaces needed namespace commit607a782855Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 17 15:44:02 2012 -0600 Refactored all models to use the new namespace * Every model using DBManager::* namespace is now Msm namespace * Almost all of this in msf/base/core * Some in modules commita690cd959bAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 17 13:41:44 2012 -0600 Move bundler setup commitdae115cc8fAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Mon Jan 9 15:51:07 2012 -0600 Moved ActiveSupport dep to gem commitd32f8edb6eAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Mon Jan 9 14:40:05 2012 -0600 Removed model require file commitd0c74cff8cAuthor: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 3 16:06:10 2012 -0600 Update some more finds commit4eb79ea6b5Author: Trevor Rosen <Trevor_Rosen@rapid7.com> Date: Tue Jan 3 14:21:15 2012 -0600 Yet another dumb commit commita75febcb59Author: Trevor Rosen <trevor@catapult-creative.com> Date: Thu Dec 29 19:20:51 2011 -0600 Fixing deletion commitdc139ff2fdAuthor: Trevor Rosen <trevor@catapult-creative.com> Date: Wed Dec 7 17:06:45 2011 -0600 Fixed erroneous commit commit531c1e611cAuthor: Trevor Rosen <trevor@catapult-creative.com> Date: Mon Nov 21 16:11:35 2011 -0600 Remove AR patch stuff; attempting to debug non-connection between MSF and Pro commit4586112241Author: Trevor Rosen <trevor@catapult-creative.com> Date: Fri Nov 18 16:17:27 2011 -0600 Drop ActiveRecord/ActiveSupport in preparation for upgrade
1002 lines
23 KiB
C
1002 lines
23 KiB
C
/*
|
|
* MessagePack for Ruby unpacking routine
|
|
*
|
|
* Copyright (C) 2008-2010 FURUHASHI Sadayuki
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#include "ruby.h"
|
|
#include "compat.h"
|
|
|
|
#include "msgpack/unpack_define.h"
|
|
|
|
static ID s_sysread;
|
|
static ID s_readpartial;
|
|
|
|
struct unpack_buffer {
|
|
size_t used;
|
|
size_t free;
|
|
char* ptr;
|
|
};
|
|
|
|
typedef struct {
|
|
int finished;
|
|
VALUE source;
|
|
size_t offset;
|
|
struct unpack_buffer buffer;
|
|
VALUE stream;
|
|
VALUE streambuf;
|
|
ID stream_append_method;
|
|
size_t buffer_free_size;
|
|
} unpack_user;
|
|
|
|
|
|
#define msgpack_unpack_struct(name) \
|
|
struct template ## name
|
|
|
|
#define msgpack_unpack_func(ret, name) \
|
|
ret template ## name
|
|
|
|
#define msgpack_unpack_callback(name) \
|
|
template_callback ## name
|
|
|
|
#define msgpack_unpack_object VALUE
|
|
|
|
#define msgpack_unpack_user unpack_user
|
|
|
|
|
|
struct template_context;
|
|
typedef struct template_context msgpack_unpack_t;
|
|
|
|
static void template_init(msgpack_unpack_t* u);
|
|
|
|
static VALUE template_data(msgpack_unpack_t* u);
|
|
|
|
static int template_execute(msgpack_unpack_t* u,
|
|
const char* data, size_t len, size_t* off);
|
|
|
|
|
|
static inline VALUE template_callback_root(unpack_user* u)
|
|
{ return Qnil; }
|
|
|
|
static inline int template_callback_uint8(unpack_user* u, uint8_t d, VALUE* o)
|
|
{ *o = INT2FIX(d); return 0; }
|
|
|
|
static inline int template_callback_uint16(unpack_user* u, uint16_t d, VALUE* o)
|
|
{ *o = INT2FIX(d); return 0; }
|
|
|
|
static inline int template_callback_uint32(unpack_user* u, uint32_t d, VALUE* o)
|
|
{ *o = UINT2NUM(d); return 0; }
|
|
|
|
static inline int template_callback_uint64(unpack_user* u, uint64_t d, VALUE* o)
|
|
{ *o = rb_ull2inum(d); return 0; }
|
|
|
|
static inline int template_callback_int8(unpack_user* u, int8_t d, VALUE* o)
|
|
{ *o = INT2FIX((long)d); return 0; }
|
|
|
|
static inline int template_callback_int16(unpack_user* u, int16_t d, VALUE* o)
|
|
{ *o = INT2FIX((long)d); return 0; }
|
|
|
|
static inline int template_callback_int32(unpack_user* u, int32_t d, VALUE* o)
|
|
{ *o = INT2NUM((long)d); return 0; }
|
|
|
|
static inline int template_callback_int64(unpack_user* u, int64_t d, VALUE* o)
|
|
{ *o = rb_ll2inum(d); return 0; }
|
|
|
|
static inline int template_callback_float(unpack_user* u, float d, VALUE* o)
|
|
{ *o = rb_float_new(d); return 0; }
|
|
|
|
static inline int template_callback_double(unpack_user* u, double d, VALUE* o)
|
|
{ *o = rb_float_new(d); return 0; }
|
|
|
|
static inline int template_callback_nil(unpack_user* u, VALUE* o)
|
|
{ *o = Qnil; return 0; }
|
|
|
|
static inline int template_callback_true(unpack_user* u, VALUE* o)
|
|
{ *o = Qtrue; return 0; }
|
|
|
|
static inline int template_callback_false(unpack_user* u, VALUE* o)
|
|
{ *o = Qfalse; return 0;}
|
|
|
|
static inline int template_callback_array(unpack_user* u, unsigned int n, VALUE* o)
|
|
{ *o = rb_ary_new2(n); return 0; }
|
|
|
|
static inline int template_callback_array_item(unpack_user* u, VALUE* c, VALUE o)
|
|
{ rb_ary_push(*c, o); return 0; } // FIXME set value directry RARRAY_PTR(obj)[RARRAY_LEN(obj)++]
|
|
|
|
static inline int template_callback_map(unpack_user* u, unsigned int n, VALUE* o)
|
|
{ *o = rb_hash_new(); return 0; }
|
|
|
|
static inline int template_callback_map_item(unpack_user* u, VALUE* c, VALUE k, VALUE v)
|
|
{ rb_hash_aset(*c, k, v); return 0; }
|
|
|
|
#ifdef RSTRING_EMBED_LEN_MAX
|
|
#define COW_MIN_SIZE RSTRING_EMBED_LEN_MAX
|
|
#else
|
|
#define COW_MIN_SIZE ((sizeof(VALUE)*3)/sizeof(char)-1)
|
|
#endif
|
|
|
|
static inline int template_callback_raw(unpack_user* u, const char* b, const char* p, unsigned int l, VALUE* o)
|
|
{
|
|
if(u->source == Qnil || l <= COW_MIN_SIZE) {
|
|
*o = rb_str_new(p, l);
|
|
} else {
|
|
*o = rb_str_substr(u->source, p - b, l);
|
|
}
|
|
#ifdef COMPAT_HAVE_ENCODING
|
|
ENCODING_SET(*o, s_enc_utf8);
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
|
|
#include "msgpack/unpack_template.h"
|
|
|
|
|
|
#define UNPACKER(from, name) \
|
|
msgpack_unpack_t *name = NULL; \
|
|
Data_Get_Struct(from, msgpack_unpack_t, name); \
|
|
if(name == NULL) { \
|
|
rb_raise(rb_eArgError, "NULL found for " # name " when shouldn't be."); \
|
|
}
|
|
|
|
#define CHECK_STRING_TYPE(value) \
|
|
value = rb_check_string_type(value); \
|
|
if( NIL_P(value) ) { \
|
|
rb_raise(rb_eTypeError, "instance of String needed"); \
|
|
}
|
|
|
|
|
|
static VALUE template_execute_rescue(VALUE nouse)
|
|
{
|
|
rb_gc_enable();
|
|
COMPAT_RERAISE;
|
|
}
|
|
|
|
static VALUE template_execute_do(VALUE argv)
|
|
{
|
|
VALUE* args = (VALUE*)argv;
|
|
|
|
msgpack_unpack_t* mp = (msgpack_unpack_t*)args[0];
|
|
char* dptr = (char*)args[1];
|
|
size_t dlen = (size_t)args[2];
|
|
size_t* from = (size_t*)args[3];
|
|
|
|
int ret = template_execute(mp, dptr, dlen, from);
|
|
|
|
return (VALUE)ret;
|
|
}
|
|
|
|
static int template_execute_wrap(msgpack_unpack_t* mp,
|
|
VALUE str, size_t dlen, size_t* from)
|
|
{
|
|
VALUE args[4] = {
|
|
(VALUE)mp,
|
|
(VALUE)RSTRING_PTR(str),
|
|
(VALUE)dlen,
|
|
(VALUE)from,
|
|
};
|
|
|
|
// FIXME execute実行中はmp->topが更新されないのでGC markが機能しない
|
|
rb_gc_disable();
|
|
|
|
mp->user.source = str;
|
|
|
|
int ret = (int)rb_rescue(template_execute_do, (VALUE)args,
|
|
template_execute_rescue, Qnil);
|
|
|
|
rb_gc_enable();
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int template_execute_wrap_each(msgpack_unpack_t* mp,
|
|
const char* ptr, size_t dlen, size_t* from)
|
|
{
|
|
VALUE args[4] = {
|
|
(VALUE)mp,
|
|
(VALUE)ptr,
|
|
(VALUE)dlen,
|
|
(VALUE)from,
|
|
};
|
|
|
|
// FIXME execute実行中はmp->topが更新されないのでGC markが機能しない
|
|
rb_gc_disable();
|
|
|
|
mp->user.source = Qnil;
|
|
|
|
int ret = (int)rb_rescue(template_execute_do, (VALUE)args,
|
|
template_execute_rescue, Qnil);
|
|
|
|
rb_gc_enable();
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
static VALUE cUnpacker;
|
|
|
|
|
|
/**
|
|
* Document-module: MessagePack::UnpackerError
|
|
*
|
|
*/
|
|
static VALUE eUnpackError;
|
|
|
|
|
|
#ifndef MSGPACK_UNPACKER_BUFFER_INIT_SIZE
|
|
#define MSGPACK_UNPACKER_BUFFER_INIT_SIZE (32*1024)
|
|
#endif
|
|
|
|
#ifndef MSGPACK_UNPACKER_BUFFER_RESERVE_SIZE
|
|
#define MSGPACK_UNPACKER_BUFFER_RESERVE_SIZE (8*1024)
|
|
#endif
|
|
|
|
/*
|
|
#ifndef MSGPACK_BUFFER_FREE_SIZE
|
|
#define MSGPACK_BUFFER_FREE_SIZE (1024*1024)
|
|
#endif
|
|
*/
|
|
#define MSGPACK_BUFFER_FREE_SIZE 0
|
|
|
|
static void MessagePack_Unpacker_free(void* data)
|
|
{
|
|
if(data) {
|
|
msgpack_unpack_t* mp = (msgpack_unpack_t*)data;
|
|
free(mp->user.buffer.ptr);
|
|
free(mp);
|
|
}
|
|
}
|
|
|
|
static void MessagePack_Unpacker_mark(msgpack_unpack_t *mp)
|
|
{
|
|
unsigned int i;
|
|
rb_gc_mark(mp->user.stream);
|
|
rb_gc_mark(mp->user.streambuf);
|
|
rb_gc_mark_maybe(template_data(mp));
|
|
for(i=0; i < mp->top; ++i) {
|
|
rb_gc_mark(mp->stack[i].obj);
|
|
rb_gc_mark_maybe(mp->stack[i].map_key);
|
|
}
|
|
}
|
|
|
|
static VALUE MessagePack_Unpacker_alloc(VALUE klass)
|
|
{
|
|
VALUE obj;
|
|
msgpack_unpack_t* mp = ALLOC_N(msgpack_unpack_t, 1);
|
|
|
|
// rb_gc_mark (not _maybe) is used for following member objects.
|
|
mp->user.stream = Qnil;
|
|
mp->user.streambuf = Qnil;
|
|
|
|
mp->user.finished = 0;
|
|
mp->user.offset = 0;
|
|
mp->user.buffer.used = 0;
|
|
mp->user.buffer.free = 0;
|
|
mp->user.buffer.ptr = NULL;
|
|
|
|
obj = Data_Wrap_Struct(klass, MessagePack_Unpacker_mark,
|
|
MessagePack_Unpacker_free, mp);
|
|
return obj;
|
|
}
|
|
|
|
static ID append_method_of(VALUE stream)
|
|
{
|
|
if(rb_respond_to(stream, s_sysread)) {
|
|
return s_sysread;
|
|
} else {
|
|
return s_readpartial;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#initialize
|
|
*
|
|
* call-seq:
|
|
* MessagePack::Unpacker.new(stream = nil)
|
|
*
|
|
* Creates instance of MessagePack::Unpacker.
|
|
*
|
|
* You can specify a _stream_ for input stream.
|
|
* It is required to implement *sysread* or *readpartial* method.
|
|
*
|
|
* With the input stream, buffers will be feeded into the deserializer automatically.
|
|
*
|
|
* Without the input stream, use *feed* method manually. Or you can manage the buffer manually
|
|
* with *execute*, *finished?*, *data* and *reset* methods.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
VALUE stream;
|
|
switch(argc) {
|
|
case 0:
|
|
stream = Qnil;
|
|
break;
|
|
case 1:
|
|
stream = argv[0];
|
|
break;
|
|
default:
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
|
|
}
|
|
|
|
UNPACKER(self, mp);
|
|
template_init(mp);
|
|
mp->user.stream = stream;
|
|
mp->user.streambuf = rb_str_buf_new(MSGPACK_UNPACKER_BUFFER_RESERVE_SIZE);
|
|
mp->user.stream_append_method = append_method_of(stream);
|
|
mp->user.buffer_free_size = MSGPACK_BUFFER_FREE_SIZE;
|
|
|
|
return self;
|
|
}
|
|
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#stream
|
|
*
|
|
* call-seq:
|
|
* unpacker.stream
|
|
*
|
|
* Gets the input stream.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_stream_get(VALUE self)
|
|
{
|
|
UNPACKER(self, mp);
|
|
return mp->user.stream;
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#stream=
|
|
*
|
|
* call-seq:
|
|
* unpacker.stream = stream
|
|
*
|
|
* Resets the input stream. You can set nil not to use input stream.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_stream_set(VALUE self, VALUE val)
|
|
{
|
|
UNPACKER(self, mp);
|
|
mp->user.stream = val;
|
|
mp->user.stream_append_method = append_method_of(val);
|
|
return val;
|
|
}
|
|
|
|
|
|
static void reserve_buffer(msgpack_unpack_t* mp, size_t require)
|
|
{
|
|
struct unpack_buffer* buffer = &mp->user.buffer;
|
|
|
|
if(buffer->used == 0) {
|
|
if(require <= buffer->free) {
|
|
/* enough free space */
|
|
return;
|
|
}
|
|
/* no used buffer: realloc only */
|
|
size_t nsize = buffer->free == 0 ?
|
|
MSGPACK_UNPACKER_BUFFER_INIT_SIZE : buffer->free*2;
|
|
while(nsize < require) {
|
|
nsize *= 2;
|
|
}
|
|
char* tmp = REALLOC_N(buffer->ptr, char, nsize);
|
|
buffer->free = nsize;
|
|
buffer->ptr = tmp;
|
|
return;
|
|
}
|
|
|
|
if(buffer->used <= mp->user.offset) {
|
|
/* clear buffer and rewind offset */
|
|
buffer->free += buffer->used;
|
|
buffer->used = 0;
|
|
mp->user.offset = 0;
|
|
}
|
|
|
|
if(require <= buffer->free) {
|
|
/* enough free space */
|
|
return;
|
|
}
|
|
|
|
size_t nsize = (buffer->used + buffer->free) * 2;
|
|
|
|
if(mp->user.offset <= buffer->used / 2) {
|
|
/* parsed less than half: realloc only */
|
|
while(nsize < buffer->used + require) {
|
|
nsize *= 2;
|
|
}
|
|
char* tmp = REALLOC_N(buffer->ptr, char, nsize);
|
|
buffer->free = nsize - buffer->used;
|
|
buffer->ptr = tmp;
|
|
|
|
} else {
|
|
/* parsed more than half: realloc and move */
|
|
size_t not_parsed = buffer->used - mp->user.offset;
|
|
while(nsize < not_parsed + require) {
|
|
nsize *= 2;
|
|
}
|
|
char* tmp = REALLOC_N(buffer->ptr, char, nsize);
|
|
memcpy(tmp, tmp + mp->user.offset, not_parsed);
|
|
buffer->free = nsize - not_parsed;
|
|
buffer->used = not_parsed;
|
|
buffer->ptr = tmp;
|
|
mp->user.offset = 0;
|
|
}
|
|
}
|
|
|
|
static inline void try_free_buffer(msgpack_unpack_t* mp, size_t require)
|
|
{
|
|
if(mp->user.buffer_free_size == 0) {
|
|
return;
|
|
}
|
|
|
|
struct unpack_buffer* buffer = &mp->user.buffer;
|
|
size_t csize = buffer->used + buffer->free;
|
|
|
|
if(csize <= mp->user.buffer_free_size) {
|
|
return;
|
|
}
|
|
|
|
if(mp->user.offset <= buffer->used / 2) {
|
|
/* parsed less than half: do nothing */
|
|
|
|
} else if(mp->user.offset < buffer->used) {
|
|
/* parsed more than half but not all: realloc and move */
|
|
size_t nsize = MSGPACK_UNPACKER_BUFFER_INIT_SIZE;
|
|
size_t not_parsed = buffer->used - mp->user.offset;
|
|
while(nsize < not_parsed + require) {
|
|
nsize *= 2;
|
|
}
|
|
|
|
if(nsize >= csize) {
|
|
return;
|
|
}
|
|
|
|
char* tmp;
|
|
if(mp->user.offset == 0) {
|
|
tmp = ALLOC_N(char, nsize);
|
|
memcpy(tmp, buffer->ptr + mp->user.offset, not_parsed);
|
|
free(buffer->ptr);
|
|
} else {
|
|
tmp = REALLOC_N(buffer->ptr, char, nsize);
|
|
}
|
|
buffer->free = nsize - not_parsed;
|
|
buffer->used = not_parsed;
|
|
buffer->ptr = tmp;
|
|
mp->user.offset = 0;
|
|
|
|
} else {
|
|
/* all parsed: free all */
|
|
free(buffer->ptr);
|
|
buffer->free = 0;
|
|
buffer->used = 0;
|
|
buffer->ptr = NULL;
|
|
mp->user.offset = 0;
|
|
}
|
|
}
|
|
|
|
static void feed_buffer(msgpack_unpack_t* mp, const char* ptr, size_t len)
|
|
{
|
|
struct unpack_buffer* buffer = &mp->user.buffer;
|
|
|
|
reserve_buffer(mp, len);
|
|
|
|
memcpy(buffer->ptr + buffer->used, ptr, len);
|
|
buffer->used += len;
|
|
buffer->free -= len;
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#feed
|
|
*
|
|
* call-seq:
|
|
* unpacker.feed(data)
|
|
*
|
|
* Fills the internal buffer with the specified buffer.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_feed(VALUE self, VALUE data)
|
|
{
|
|
UNPACKER(self, mp);
|
|
StringValue(data);
|
|
feed_buffer(mp, RSTRING_PTR(data), RSTRING_LEN(data));
|
|
return Qnil;
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#fill
|
|
*
|
|
* call-seq:
|
|
* unpacker.fill -> length of read data
|
|
*
|
|
* Fills the internal buffer using the input stream.
|
|
*
|
|
* If the input stream is not specified, it returns nil.
|
|
* You can set it on *initialize* or *stream=* methods.
|
|
*
|
|
* This methods raises exceptions that _stream.sysread_ or
|
|
* _stream.readpartial_ method raises.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_fill(VALUE self)
|
|
{
|
|
UNPACKER(self, mp);
|
|
|
|
if(mp->user.stream == Qnil) {
|
|
return Qnil;
|
|
}
|
|
|
|
rb_funcall(mp->user.stream, mp->user.stream_append_method, 2,
|
|
LONG2FIX(MSGPACK_UNPACKER_BUFFER_RESERVE_SIZE),
|
|
mp->user.streambuf);
|
|
|
|
size_t len = RSTRING_LEN(mp->user.streambuf);
|
|
feed_buffer(mp, RSTRING_PTR(mp->user.streambuf), len);
|
|
|
|
return LONG2FIX(len);
|
|
}
|
|
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#each
|
|
*
|
|
* call-seq:
|
|
* unpacker.each {|object| }
|
|
*
|
|
* Deserializes objects repeatedly. This calls *fill* method automatically.
|
|
*
|
|
* UnpackError is throw when parse error is occured.
|
|
* This method raises exceptions that *fill* method raises.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_each(VALUE self)
|
|
{
|
|
UNPACKER(self, mp);
|
|
int ret;
|
|
|
|
#ifdef RETURN_ENUMERATOR
|
|
RETURN_ENUMERATOR(self, 0, 0);
|
|
#endif
|
|
|
|
while(1) {
|
|
if(mp->user.buffer.used <= mp->user.offset) {
|
|
do_fill:
|
|
{
|
|
VALUE len = MessagePack_Unpacker_fill(self);
|
|
if(len == Qnil || FIX2LONG(len) == 0) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
ret = template_execute_wrap_each(mp,
|
|
mp->user.buffer.ptr, mp->user.buffer.used,
|
|
&mp->user.offset);
|
|
|
|
if(ret < 0) {
|
|
rb_raise(eUnpackError, "parse error.");
|
|
|
|
} else if(ret > 0) {
|
|
VALUE data = template_data(mp);
|
|
template_init(mp);
|
|
rb_yield(data);
|
|
|
|
} else {
|
|
goto do_fill;
|
|
}
|
|
}
|
|
|
|
try_free_buffer(mp, 0);
|
|
|
|
return Qnil;
|
|
}
|
|
|
|
static VALUE feed_each_impl(VALUE args)
|
|
{
|
|
VALUE self = ((VALUE*)args)[0];
|
|
VALUE data = ((VALUE*)args)[1];
|
|
size_t* pconsumed = (size_t*)((VALUE*)args)[2];
|
|
|
|
UNPACKER(self, mp);
|
|
int ret;
|
|
const char* ptr = RSTRING_PTR(data);
|
|
size_t len = RSTRING_LEN(data);
|
|
|
|
if(mp->user.buffer.used > 0) {
|
|
while(1) {
|
|
ret = template_execute_wrap_each(mp,
|
|
mp->user.buffer.ptr, mp->user.buffer.used,
|
|
&mp->user.offset);
|
|
|
|
if(ret < 0) {
|
|
rb_raise(eUnpackError, "parse error.");
|
|
|
|
} else if(ret > 0) {
|
|
VALUE data = template_data(mp);
|
|
template_init(mp);
|
|
rb_yield(data);
|
|
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(len <= 0) {
|
|
return Qnil;
|
|
}
|
|
|
|
if(mp->user.buffer.used <= mp->user.offset) {
|
|
// wrap & execute & feed
|
|
while(1) {
|
|
ret = template_execute_wrap_each(mp,
|
|
ptr, len, pconsumed);
|
|
|
|
if(ret < 0) {
|
|
rb_raise(eUnpackError, "parse error.");
|
|
|
|
} else if(ret > 0) {
|
|
VALUE data = template_data(mp);
|
|
template_init(mp);
|
|
rb_yield(data);
|
|
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
} else {
|
|
// feed & execute
|
|
feed_buffer(mp, ptr, len);
|
|
*pconsumed = len;
|
|
|
|
while(1) {
|
|
ret = template_execute_wrap_each(mp,
|
|
mp->user.buffer.ptr, mp->user.buffer.used,
|
|
&mp->user.offset);
|
|
|
|
if(ret < 0) {
|
|
rb_raise(eUnpackError, "parse error.");
|
|
|
|
} else if(ret > 0) {
|
|
VALUE data = template_data(mp);
|
|
template_init(mp);
|
|
rb_yield(data);
|
|
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
return Qnil;
|
|
}
|
|
|
|
static VALUE feed_each_ensure(VALUE args) {
|
|
VALUE self = ((VALUE*)args)[0];
|
|
VALUE data = ((VALUE*)args)[1];
|
|
size_t* pconsumed = (size_t*)((VALUE*)args)[2];
|
|
|
|
const char* dptr = RSTRING_PTR(data) + *pconsumed;
|
|
size_t dlen = RSTRING_LEN(data) - *pconsumed;
|
|
|
|
if(dlen > 0) {
|
|
UNPACKER(self, mp);
|
|
try_free_buffer(mp, dlen);
|
|
feed_buffer(mp, dptr, dlen);
|
|
}
|
|
|
|
return Qnil;
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#feed_each
|
|
*
|
|
* call-seq:
|
|
* unpacker.feed_each(data) {|object| }
|
|
*
|
|
* Same as feed(data) + each {|object| }, but tries to avoid copying of the buffer.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_feed_each(VALUE self, VALUE data)
|
|
{
|
|
size_t consumed = 0;
|
|
StringValue(data);
|
|
|
|
VALUE args[3];
|
|
args[0] = self;
|
|
args[1] = data;
|
|
args[2] = (VALUE)&consumed;
|
|
|
|
return rb_ensure(feed_each_impl, (VALUE)args,
|
|
feed_each_ensure, (VALUE)args);
|
|
}
|
|
|
|
|
|
static inline VALUE MessagePack_unpack_impl(VALUE self, VALUE data, unsigned long dlen)
|
|
{
|
|
msgpack_unpack_t mp;
|
|
template_init(&mp);
|
|
|
|
mp.user.finished = 0;
|
|
|
|
size_t from = 0;
|
|
int ret = template_execute_wrap(&mp, data, dlen, &from);
|
|
|
|
if(ret < 0) {
|
|
rb_raise(eUnpackError, "parse error.");
|
|
|
|
} else if(ret == 0) {
|
|
rb_raise(eUnpackError, "insufficient bytes.");
|
|
|
|
} else {
|
|
if(from < dlen) {
|
|
rb_raise(eUnpackError, "extra bytes.");
|
|
}
|
|
return template_data(&mp);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker.unpack_limit
|
|
*
|
|
* call-seq:
|
|
* MessagePack::Unpacker.unpack_limit(data, limit) -> object
|
|
*
|
|
* Deserializes one object over the specified buffer upto _limit_ bytes.
|
|
*
|
|
* UnpackError is throw when parse error is occured, the buffer is insufficient
|
|
* to deserialize one object or there are extra bytes.
|
|
*/
|
|
static VALUE MessagePack_unpack_limit(VALUE self, VALUE data, VALUE limit)
|
|
{
|
|
CHECK_STRING_TYPE(data);
|
|
return MessagePack_unpack_impl(self, data, NUM2ULONG(limit));
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker.unpack
|
|
*
|
|
* call-seq:
|
|
* MessagePack::Unpacker.unpack(data) -> object
|
|
*
|
|
* Deserializes one object over the specified buffer.
|
|
*
|
|
* UnpackError is throw when parse error is occured, the buffer is insufficient
|
|
* to deserialize one object or there are extra bytes.
|
|
*/
|
|
static VALUE MessagePack_unpack(VALUE self, VALUE data)
|
|
{
|
|
CHECK_STRING_TYPE(data);
|
|
return MessagePack_unpack_impl(self, data, RSTRING_LEN(data));
|
|
}
|
|
|
|
|
|
static VALUE MessagePack_Unpacker_execute_impl(VALUE self, VALUE data,
|
|
size_t from, size_t limit)
|
|
{
|
|
UNPACKER(self, mp);
|
|
|
|
if(from >= limit) {
|
|
rb_raise(eUnpackError, "offset is bigger than data buffer size.");
|
|
}
|
|
|
|
int ret = template_execute_wrap(mp, data, limit, &from);
|
|
|
|
if(ret < 0) {
|
|
rb_raise(eUnpackError, "parse error.");
|
|
} else if(ret > 0) {
|
|
mp->user.finished = 1;
|
|
return ULONG2NUM(from);
|
|
} else {
|
|
mp->user.finished = 0;
|
|
return ULONG2NUM(from);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#execute_limit
|
|
*
|
|
* call-seq:
|
|
* unpacker.execute_limit(data, offset, limit) -> next offset
|
|
*
|
|
* Deserializes one object over the specified buffer from _offset_ bytes upto _limit_ bytes.
|
|
*
|
|
* This method doesn't use the internal buffer.
|
|
*
|
|
* Call *reset* method before calling this method again.
|
|
*
|
|
* UnpackError is throw when parse error is occured.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_execute_limit(VALUE self, VALUE data,
|
|
VALUE off, VALUE limit)
|
|
{
|
|
CHECK_STRING_TYPE(data);
|
|
return MessagePack_Unpacker_execute_impl(self, data,
|
|
(size_t)NUM2ULONG(off), (size_t)NUM2ULONG(limit));
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#execute
|
|
*
|
|
* call-seq:
|
|
* unpacker.execute(data, offset) -> next offset
|
|
*
|
|
* Deserializes one object over the specified buffer from _offset_ bytes.
|
|
*
|
|
* This method doesn't use the internal buffer.
|
|
*
|
|
* Call *reset* method before calling this method again.
|
|
*
|
|
* This returns offset that was parsed to.
|
|
* Use *finished?* method to check an object is deserialized and call *data*
|
|
* method if it returns true.
|
|
*
|
|
* UnpackError is throw when parse error is occured.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_execute(VALUE self, VALUE data, VALUE off)
|
|
{
|
|
CHECK_STRING_TYPE(data);
|
|
return MessagePack_Unpacker_execute_impl(self, data,
|
|
(size_t)NUM2ULONG(off), (size_t)RSTRING_LEN(data));
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#finished?
|
|
*
|
|
* call-seq:
|
|
* unpacker.finished?
|
|
*
|
|
* Returns true if an object is ready to get with data method.
|
|
*
|
|
* Use this method with execute method.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_finished_p(VALUE self)
|
|
{
|
|
UNPACKER(self, mp);
|
|
if(mp->user.finished) {
|
|
return Qtrue;
|
|
}
|
|
return Qfalse;
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#data
|
|
*
|
|
* call-seq:
|
|
* unpacker.data
|
|
*
|
|
* Gets the object deserialized by execute method.
|
|
*
|
|
* Use this method with execute method.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_data(VALUE self)
|
|
{
|
|
UNPACKER(self, mp);
|
|
return template_data(mp);
|
|
}
|
|
|
|
/**
|
|
* Document-method: MessagePack::Unpacker#reset
|
|
*
|
|
* call-seq:
|
|
* unpacker.reset
|
|
*
|
|
* Resets the internal state of the unpacker.
|
|
*/
|
|
static VALUE MessagePack_Unpacker_reset(VALUE self)
|
|
{
|
|
UNPACKER(self, mp);
|
|
template_init(mp);
|
|
mp->user.finished = 0;
|
|
try_free_buffer(mp, 0);
|
|
return self;
|
|
}
|
|
|
|
|
|
void Init_msgpack_unpack(VALUE mMessagePack)
|
|
{
|
|
s_sysread = rb_intern("sysread");
|
|
s_readpartial = rb_intern("readpartial");
|
|
|
|
eUnpackError = rb_define_class_under(mMessagePack, "UnpackError", rb_eStandardError);
|
|
cUnpacker = rb_define_class_under(mMessagePack, "Unpacker", rb_cObject);
|
|
rb_define_alloc_func(cUnpacker, MessagePack_Unpacker_alloc);
|
|
|
|
rb_define_method(cUnpacker, "initialize", MessagePack_Unpacker_initialize, -1);
|
|
|
|
/* Buffered API */
|
|
rb_define_method(cUnpacker, "feed", MessagePack_Unpacker_feed, 1);
|
|
rb_define_method(cUnpacker, "fill", MessagePack_Unpacker_fill, 0);
|
|
rb_define_method(cUnpacker, "each", MessagePack_Unpacker_each, 0);
|
|
rb_define_method(cUnpacker, "stream", MessagePack_Unpacker_stream_get, 0);
|
|
rb_define_method(cUnpacker, "stream=", MessagePack_Unpacker_stream_set, 1);
|
|
rb_define_method(cUnpacker, "feed_each", MessagePack_Unpacker_feed_each, 1);
|
|
|
|
/* Unbuffered API */
|
|
rb_define_method(cUnpacker, "execute", MessagePack_Unpacker_execute, 2);
|
|
rb_define_method(cUnpacker, "execute_limit", MessagePack_Unpacker_execute_limit, 3);
|
|
rb_define_method(cUnpacker, "finished?", MessagePack_Unpacker_finished_p, 0);
|
|
rb_define_method(cUnpacker, "data", MessagePack_Unpacker_data, 0);
|
|
rb_define_method(cUnpacker, "reset", MessagePack_Unpacker_reset, 0);
|
|
|
|
/**
|
|
* MessagePack module is defined in rbinit.c file.
|
|
* mMessagePack = rb_define_module("MessagePack");
|
|
*/
|
|
rb_define_module_function(mMessagePack, "unpack", MessagePack_unpack, 1);
|
|
rb_define_module_function(mMessagePack, "unpack_limit", MessagePack_unpack_limit, 2);
|
|
}
|
|
|
|
/**
|
|
* Document-module: MessagePack::Unpacker
|
|
*
|
|
* Deserializer class that includes Buffered API and Unbuffered API.
|
|
*
|
|
*
|
|
* Buffered API uses the internal buffer of the Unpacker.
|
|
* Following code uses Buffered API with an input stream:
|
|
*
|
|
* # create an unpacker with input stream.
|
|
* pac = MessagePack::Unpacker.new(STDIN)
|
|
*
|
|
* # deserialize object one after another.
|
|
* pac.each {|obj|
|
|
* # ...
|
|
* }
|
|
*
|
|
*
|
|
* Following code doesn't use the input stream and feeds buffer
|
|
* manually. This is useful to use special stream or with
|
|
* event-driven I/O library.
|
|
*
|
|
* # create an unpacker without input stream.
|
|
* pac = MessagePack::Unpacker.new()
|
|
*
|
|
* # feed buffer to the internal buffer.
|
|
* pac.feed(input_bytes)
|
|
*
|
|
* # deserialize object one after another.
|
|
* pac.each {|obj|
|
|
* # ...
|
|
* }
|
|
*
|
|
*
|
|
* You can manage the buffer manually with the combination of
|
|
* *execute*, *finished?*, *data* and *reset* method.
|
|
*
|
|
* # create an unpacker.
|
|
* pac = MessagePack::Unpacker.new()
|
|
*
|
|
* # manage buffer and offset manually.
|
|
* offset = 0
|
|
* buffer = ''
|
|
*
|
|
* # read some data into the buffer.
|
|
* buffer << [1,2,3].to_msgpack
|
|
* buffer << [4,5,6].to_msgpack
|
|
*
|
|
* while true
|
|
* offset = pac.execute(buffer, offset)
|
|
*
|
|
* if pac.finished?
|
|
* obj = pac.data
|
|
*
|
|
* buffer.slice!(0, offset)
|
|
* offset = 0
|
|
* pac.reset
|
|
*
|
|
* # do something with the object
|
|
* # ...
|
|
*
|
|
* # repeat execution if there are more data.
|
|
* next unless buffer.empty?
|
|
* end
|
|
*
|
|
* break
|
|
* end
|
|
*/
|
|
|