sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:master: tm: _reply cleans up after itself
by Andrei Pelinescu-Onciul 22 Feb '10

22 Feb '10

Module: sip-router Branch: master Commit: 4178ad7297258ef45fce7d6c9cfd6247bdd37809 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4178ad7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 17:48:45 2010 +0100 tm: _reply cleans up after itself The _reply() function now cleans possible added reply_lumps before exiting. This allows using it not only from request or failure route. --- modules/tm/t_reply.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 47c9dc4..f37903a 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -92,6 +92,8 @@ * 2009-06-01 Pre- and post-script callbacks of branch route are * executed (Miklos) * 2009-12-10 reply route is executed under lock to protect the avps (andrei) + * 2010-02-22 _reply() will cleanup any reply lumps that it might have added + * (andrei) * */ @@ -653,7 +655,9 @@ static int _reply( struct cell *trans, struct sip_msg* p_msg, char * buf, *dset; struct bookmark bm; int dset_len; + struct lump_rpl* rpl_l; + rpl_l=0; if (code>=200) set_kr(REQ_RPLD); /* compute the buffer in private memory prior to entering lock; * create to-tag if needed */ @@ -671,12 +675,19 @@ static int _reply( struct cell *trans, struct sip_msg* p_msg, || get_to(p_msg)->tag_value.len==0)) { calc_crc_suffix( p_msg, tm_tag_suffix ); buf = build_res_buf_from_sip_req(code,text, &tm_tag, p_msg, &len, &bm); + if (unlikely(rpl_l)){ + unlink_lump_rpl(p_msg, rpl_l); + free_lump_rpl(rpl_l); + } return _reply_light( trans, buf, len, code, text, tm_tag.s, TOTAG_VALUE_LEN, lock, &bm); } else { buf = build_res_buf_from_sip_req(code,text, 0 /*no to-tag*/, p_msg, &len, &bm); - + if (unlikely(rpl_l)){ + unlink_lump_rpl(p_msg, rpl_l); + free_lump_rpl(rpl_l); + } return _reply_light(trans,buf,len,code,text, 0, 0, /* no to-tag */lock, &bm); }

1 0

git:master: Merge remote branch 'origin/andrei/blst_send_flags'
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

Module: sip-router Branch: master Commit: 04f55d6c20fbb7628b3c672a5df5a0a1e2c67114 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04f55d6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 16:37:51 2010 +0100 Merge remote branch 'origin/andrei/blst_send_flags' Support for blacklist ignore flags, both global and on a per message basis. E.g.: per message: if (method=~"MESSAGE") blst_set_ignore(6); global: sercmd cfg.set_now_int core dst_blacklist_tcp_imask 16 * origin/andrei/blst_send_flags: NEWS: minor blacklist flag number correction tm: blacklist on 503 reply fixed for send flags NEWS: mentioned blacklist ignore masks core: cfg script support for blacklist ignore masks blst: global config variables for ignoring blacklist events blst: docs for blst_{set,clear}_ignore script functions blst: functions for ignoring blacklist events blst: use dst_blacklist_force_add tm: simplified blacklist add code blacklist: ignore mask support tm: updated to the new snd_flags_t structure core: send_flags preliminary blacklist support Conflicts: NEWS cfg.lex cfg.y dst_blacklist.h ---

1 0

git:andrei/blst_send_flags: NEWS: minor blacklist flag number correction
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

Module: sip-router Branch: andrei/blst_send_flags Commit: 4bb4f8527673e69ecb8c66ad32ae236b200cecd7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bb4f85… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 16:26:44 2010 +0100 NEWS: minor blacklist flag number correction --- NEWS | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 3896e72..75c74bf 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,8 @@ new config variables: at runtime. Default: 0 (no blacklist reason is ignored). Possible values: 0 -disabled, 2 - send error; 4 - connect error, 8 - icmp (reserverd), 16 - transaction timeout, - 32 - administratively prohibited (manually set). + 32 - 503 received, 64 - administratively prohibited + (manually set). - dst_blacklist_tcp_imask - like dst_blacklist_udp_imask, but for tcp. - dst_blacklist_tls_imask - like dst_blacklist_tls_imask, but for tcp. - dst_blacklist_sctp_imask -like dst_blacklist_sctp_imask, but for tcp.

1 0

git:andrei/blst_send_flags: tm: blacklist on 503 reply fixed for send flags
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

Module: sip-router Branch: andrei/blst_send_flags Commit: 0f2375f9216fd7f431e91d02f4ccc5dc9e4e5730 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f2375f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 15:35:57 2010 +0100 tm: blacklist on 503 reply fixed for send flags Blacklisting the source of a 503 reply now obeys also the blacklist ignore masks (both global and per message). The ignore 503 blacklist flag can be set (and it will be obeyed) in any route (be it main route, on branch, on send or the on_reply route). E.g.: using blst_set_ignore(32) in the onsend_route for a specific destination would cause the ignore 503 flag to be inherited by the 503 reply (this is the only blacklist flag that it's inherited this way). --- modules/tm/t_reply.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 0b16fae..4e53584 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1844,7 +1844,6 @@ int reply_received( struct sip_msg *p_msg ) #endif #ifdef USE_DST_BLACKLIST int blst_503_timeout; - struct dest_info src; struct hdr_field* hf; #endif #ifdef TMCB_ONSEND @@ -1972,6 +1971,10 @@ int reply_received( struct sip_msg *p_msg ) switch_rb_retr_to_t2(&uac->request); } } + /* pre-set the ignore BLST_503 flag in the message, if the + corresponding branch had it set on send */ + p_msg->fwd_send_flags.blst_imask|= + uac->request.dst.send_flags.blst_imask & BLST_503; /* processing of on_reply block */ if (t->on_reply) { set_route_type(ONREPLY_ROUTE); @@ -2008,10 +2011,13 @@ int reply_received( struct sip_msg *p_msg ) } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */ - if (cfg_get(tm, tm_cfg, tm_blst_503) - && cfg_get(core, core_cfg, use_dst_blacklist) - && (msg_status==503) - ){ + if ( (msg_status==503) && + cfg_get(tm, tm_cfg, tm_blst_503) && + /* check if the request sent on the branch had the the + blst 503 ignore flags set or it was set in the onreply_r*/ + should_blacklist_su(BLST_503, &p_msg->fwd_send_flags, + p_msg->rcv.proto, &p_msg->rcv.src_su) + ){ blst_503_timeout=cfg_get(tm, tm_cfg, tm_blst_503_default); if ((parse_headers(p_msg, HDR_RETRY_AFTER_F, 0)==0) && (p_msg->parsed_flag & HDR_RETRY_AFTER_F)){ @@ -2027,12 +2033,9 @@ int reply_received( struct sip_msg *p_msg ) } } if (blst_503_timeout){ - src.send_sock=0; - src.to=p_msg->rcv.src_su; - src.id=p_msg->rcv.proto_reserved1; - src.proto=p_msg->rcv.proto; - dst_blacklist_add_to(BLST_503, &src, p_msg, - S_TO_TICKS(blst_503_timeout)); + dst_blacklist_force_su_to(BLST_503, p_msg->rcv.proto, + &p_msg->rcv.src_su, p_msg, + S_TO_TICKS(blst_503_timeout)); } } #endif /* USE_DST_BLACKLIST */

1 0

SF.net SVN: openser:[5989] branches/1.5/modules/acc
by Marius Zbihlei 19 Feb '10

19 Feb '10

Revision: 5989 http://openser.svn.sourceforge.net/openser/?rev=5989&view=rev Author: mariuszbihlei Date: 2010-02-19 15:09:39 +0000 (Fri, 19 Feb 2010) Log Message: ----------- modules:acc Fixed a bug that caused global log_facility (the one in kamailio) to be overwritten by acc's log_facility if the module was loaded. This caused log messages to be printed in the acc's log facility (really annoying if the ) In kamailio executable log_facility in the initialized Data segment (global variables) and elf's .dynsym section , the dynamic symbol table, which contains all of the file's imported and exported symbols 08131cec D log_facility Also the same can be said for acc's log facility 00007234 D log_facility This caused that when dlopen() was called on acc.so, the .dynsym section to the concatenated, and caused the main's log_facility to resolve to wrong symbol. Patch by Timo Reimann(timo.reimann AT 1und1.de) Modified Paths: -------------- branches/1.5/modules/acc/acc.c branches/1.5/modules/acc/acc_mod.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Your opinion about presence subscription blocking actions
by Iñaki Baz Castillo 19 Feb '10

19 Feb '10

Hi, I'm dealing with presence right now. I've read full OMA and RCS specifications/proposals/guidelines for presence and XCAP but I don't feel comfortable with some parts of them. So let me to explain the question (it involves the sr/kamailio presence module behavior for a future re-design in which I want to participate): In presence/XCAP/XDM there are three ways bob can deny alice to see his presence status (by modifying the XCAP documents according): 1) Ignore alice's request. This is, bob doesn't "allow" neither "blocks" alice, so alice just gets the first NOTIFY from the server with: Subscription-Status: pending After some long time the server will send: Subscription-Status: terminated ; reason=expired 2) Block alice by invoking a "block" action. This means that alice receives a NOTIFY from the server with: Subscription-Status: terminated; reason=rejected This is: alice *knows* that she has been explicitely blocked by bob. 3) Polite-block alice by invoking "polite-block" action. In this way the presence server generates a spoofed NOTIFY for alice containing "offline" information but the header: Subscription-Status: active This is: alice *things* she has been allowed by bob and bob it's offline right now (not true). Well, in real IM/presence world (MSN, Skype, XMPP, Yahoo...) option 2 doesn't exist, am I right? This is, if you block an user he doesn't know that you have blocked him. Instead just options 1 or 3 are used (and in some networks just option 1). Do you see any advantage in point 2? Personally I don't see it and it just introduces too much complexity for presence/XCAP/XDM client developers. I would appreciate your opinnions about it. Thanks. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 2

[tracker] Task closed: tm clone msg / free_faked_req bug
by sip-router 19 Feb '10

19 Feb '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#37 - tm clone msg / free_faked_req bug User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: Merge remote branch 'origin/sr_3.0'
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

Module: sip-router Branch: master Commit: 08811a87aabf59520a8fac92bd202e9a9a916439 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08811a8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 12:05:41 2010 +0100 Merge remote branch 'origin/sr_3.0' The dst_uri fix (see FlySpray#37) and kamctl. * origin/sr_3.0: core: avoid non-null 0-length dst_uri, ruris and path tm: fake_req dst_uri and ruri copy fix utils/kamctl: removed unsupported commands to manage lcr gateways and routes ---

1 0

IPv6 problem with kamailio 3.0
by Klaus Darilion 19 Feb '10

19 Feb '10

Hi! I have a client wich registers via IPv6 - that works. Now, if this client is called, t_relay generates errors and no message is sent: INFO: <script>: main branch in branch_route[1]: INFO: <script>: $ru=sip:klaus.darilion@[2A02:850:2:2:8C4:955A:C892:A15A]:1066;transport=UDP INFO: <script>: $du=sip:[2A02:850:2:2:8C4:955A:C892:A15A]:1066 INFO: <script>: $bF=00000040 ERROR: <core> [resolve.c:1502]: ERROR: sip_hostport2su: could not resolve hostname: "[2A02:850:2:2:8C4:955A:C892:A15A]" ERROR: tm [ut.h:318]: failed to resolve "[2A02:850:2:2:8C4:955A:C892:A15A]" regards Klaus

2 5

git:master: core: PAI & PPI header names parser fixes
by Andrei Pelinescu-Onciul 19 Feb '10

19 Feb '10

Module: sip-router Branch: master Commit: 0cf3f38542375fd83d8071cd3cfa0571cf8984fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cf3f38… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 19 11:55:44 2010 +0100 core: PAI & PPI header names parser fixes Changed to the usual "case" construct. This also fixes the case when spaces were present between the header name and ':' (e.g. "P-Preferred-Identity : ..." was not recognized). --- parser/case_p_as.h | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ parser/case_p_pr.h | 83 ++++++++++++++++++++++++++++++++++++++++++++++ parser/keys.h | 20 +++++++++++ parser/parse_hname2.c | 13 +++++-- 4 files changed, 199 insertions(+), 4 deletions(-) diff --git a/parser/case_p_as.h b/parser/case_p_as.h new file mode 100644 index 0000000..46d929b --- /dev/null +++ b/parser/case_p_as.h @@ -0,0 +1,87 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * parser/case_p_as.h + */ +/* + * History: + * -------- + * 2010-02-19 initial version (andrei) +*/ + +/** Parser :: Reason Header Name Parsing Macros. + * @file + * + * @ingroup parser + */ + +#ifndef __case_p_as_h +#define __case_p_as_h + + +#define SERT_CASE \ + switch(LOWER_DWORD(val)) { \ + case _sert_: \ + p += 4; \ + val = READ(p); \ + ED_I_CASE; \ + } + + +#define ED_I_CASE \ + switch(LOWER_DWORD(val)) { \ + case _ed_i_: \ + p += 4; \ + val = READ(p); \ + DENT_CASE; \ + } + + +#define DENT_CASE \ + switch(LOWER_DWORD(val)) { \ + case _dent_: \ + p += 4; \ + val = READ(p); \ + ITY_CASE; \ + } + +#define ITY_CASE \ + switch(LOWER_DWORD(val)) { \ + case _ity1_: \ + hdr->type = HDR_PAI_T; \ + hdr->name.len = 19; \ + return (p + 4); \ + case _ity2_: \ + hdr->type = HDR_PAI_T; \ + p+=4; \ + goto dc_end; \ + } + + + +#define p_as_CASE \ + p += 4; \ + val = READ(p); \ + SERT_CASE; \ + goto other; + + + +#endif /*__case_p_as_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/parser/case_p_pr.h b/parser/case_p_pr.h new file mode 100644 index 0000000..7f43a64 --- /dev/null +++ b/parser/case_p_pr.h @@ -0,0 +1,83 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * parser/case_p_pr.h + */ +/* + * History: + * -------- + * 2010-02-19 initial version (andrei) +*/ + +/** Parser :: Reason Header Name Parsing Macros. + * @file + * + * @ingroup parser + */ + +#ifndef __case_p_pr_h +#define __case_p_pr_h + + +#define EFER_CASE \ + switch(LOWER_DWORD(val)) { \ + case _efer_: \ + p += 4; \ + val = READ(p); \ + RED__CASE; \ + } + + +#define RED__CASE \ + switch(LOWER_DWORD(val)) { \ + case _red__: \ + p += 4; \ + val = READ(p); \ + IDEN_CASE; \ + } + + +#define IDEN_CASE \ + switch(LOWER_DWORD(val)) { \ + case _iden_: \ + p += 4; \ + val = READ(p); \ + TITY_p_pr_CASE; \ + } + +#define TITY_p_pr_CASE \ + switch(LOWER_DWORD(val)) { \ + case _tity_: \ + hdr->type = HDR_PPI_T; \ + p+=4; \ + goto dc_end; \ + } + + + +#define p_pr_CASE \ + p += 4; \ + val = READ(p); \ + EFER_CASE; \ + goto other; + + + +#endif /*__case_p_pr_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/parser/keys.h b/parser/keys.h index 3fb8441..74bab82 100644 --- a/parser/keys.h +++ b/parser/keys.h @@ -43,6 +43,13 @@ * 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 3a 20 2d \endverbatim * + * A quick way to generate the hex string is: + * perl -e '$_=lc shift; print "0x".unpack("H*",reverse)."\n";' 4_char_str + * or to generate the define list: + perl -e '$s=lc shift; $s.=" "x(4-(length $s)%4); + print map("#define _". reverse ."_ 0x". (unpack "H*")."\n", + reverse unpack("(a[4])*", reverse $s));' string + * Note that some editing is still needed (replace spaces and account for ':'). * Test manually/visually if dword is intended string using: * awk '/^#define/ {printf("%s \"%c%c%c%c\" ... %s \n", $3,strtonum("0x" substr($3,9,2)),strtonum("0x" substr($3,7,2)),strtonum("0x" substr($3,5,2)),strtonum("0x" substr($3,3,2)),$5)}' keys.h * @@ -194,6 +201,19 @@ #define _on2_ 0x3a206e6f /* "on :" */ #define _on3_ 0x20206e6f /* "on " */ +#define _p_as_ 0x73612d70 /* "p-as" */ +#define _sert_ 0x74726573 /* "sert" */ +#define _ed_i_ 0x692d6465 /* "ed-i" */ +#define _dent_ 0x746e6564 /* "dent" */ +#define _ity1_ 0x3a797469 /* "ity:" */ +#define _ity2_ 0x20797469 /* "ity " */ + +#define _p_pr_ 0x72702d70 /* "p-pr" */ +#define _efer_ 0x72656665 /* "efer" */ +#define _red__ 0x2d646572 /* "red-" */ +/* _iden_ is already defined */ +/* _tity_ is already defined */ + /*!} */ #endif /* KEYS_H */ diff --git a/parser/parse_hname2.c b/parser/parse_hname2.c index 5e799ce..d541a4c 100644 --- a/parser/parse_hname2.c +++ b/parser/parse_hname2.c @@ -103,7 +103,9 @@ static inline char* skip_ws(char* p, unsigned int size) #include "case_retr.h" /* Retry-After */ #include "case_path.h" /* Path */ #include "case_priv.h" -#include "case_reas.h" +#include "case_reas.h" /* Reason */ +#include "case_p_as.h" /* P-Asserted-Identity */ +#include "case_p_pr.h" /* P-Preferred-Identity */ /*@} */ @@ -152,7 +154,9 @@ static inline char* skip_ws(char* p, unsigned int size) case _retr_: retr_CASE; \ case _path_: path_CASE; \ case _priv_: priv_CASE; \ - case _reas_: reas_CASE; + case _reas_: reas_CASE; \ + case _p_as_: p_as_CASE; \ + case _p_pr_: p_pr_CASE; #define PARSE_COMPACT(id) \ @@ -168,7 +172,7 @@ static inline char* skip_ws(char* p, unsigned int size) return (p + 2); \ } - +#if 0 int hdr_update_type(struct hdr_field* hdr) { if(hdr==0 || hdr->name.s==0) @@ -186,6 +190,7 @@ int hdr_update_type(struct hdr_field* hdr) return 0; } +#endif char* parse_hname2(char* begin, char* end, struct hdr_field* hdr) { @@ -266,7 +271,7 @@ char* parse_hname2(char* begin, char* end, struct hdr_field* hdr) } else { hdr->type = HDR_OTHER_T; hdr->name.len = p - hdr->name.s; - hdr_update_type(hdr); + /*hdr_update_type(hdr);*/ return (p + 1); } }

1 0

← Newer
1
2
3
4
5
6
7
8
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010