sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:master: modules/ratelimit Timer was ran at a 1. 5 s interval instead of timer_interval, thus rendering TAILDROP alg unusable

by Marius Zbihlei

Module: sip-router Branch: master Commit: 3a06d7d3561f889c84249eaa5ec7a5b79a2a23bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a06d7d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Apr 11 13:45:10 2011 +0300 modules/ratelimit Timer was ran at a 1.5 s interval instead of timer_interval, thus rendering TAILDROP alg unusable --- modules/ratelimit/ratelimit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 628a486..53ff559 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -424,7 +424,7 @@ static int mod_init(void) return -1; } timer_init(rl_timer, rl_timer_handle, 0, F_TIMER_FAST); - timer_add(rl_timer, MS_TO_TICKS(1500)); /* Start it after 1500ms */ + timer_add(rl_timer, MS_TO_TICKS(1000*timer_interval)); network_load_value = shm_malloc(sizeof(int)); if (network_load_value==NULL) {

13 years, 7 months

git:3.1: xcap_server: use ETag header instead of SIP-ETag

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 6d4cfc5dd8a8d7b0f67ee08120f7326edacdcf69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d4cfc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 11 12:02:23 2011 +0200 xcap_server: use ETag header instead of SIP-ETag - over http the name of header carrying entity tag is ETag - patch by Peter Dunkley (cherry picked from commit a20da4ced92796959d619adb6ba61334869f8588) --- modules_k/xcap_server/xcap_server.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 302221c..92c3178 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -550,8 +550,8 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, LM_ERR("could not generate etag\n"); goto error; } - etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */ - etag.len = etag_hdr.len - 12; /* 'SIP-ETag: ' '\r\n' */ + etag.s = etag_hdr.s + 6; /* 'ETag: ' */ + etag.len = etag_hdr.len - 8; /* 'ETag: ' '\r\n' */ if(xcaps_put_db(&turi.user, &turi.host, &xuri, &etag, &body)<0) { @@ -654,7 +654,7 @@ static int xcaps_get_db(str* user, str *domain, xcap_uri_t *xuri, goto error; } etag->len = snprintf(xcaps_etag_buf, XCAPS_ETAG_SIZE, - "SIP-ETag: %.*s\r\n", s.len, s.s); + "ETag: %.*s\r\n", s.len, s.s); if(etag->len < 0) { LM_ERR("error printing etag hdr\n "); @@ -953,8 +953,8 @@ static int w_xcaps_del(sip_msg_t* msg, char* puri, char* ppath) LM_ERR("could not generate etag\n"); goto error; } - etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */ - etag.len = etag_hdr.len - 12; /* 'SIP-ETag: ' '\r\n' */ + etag.s = etag_hdr.s + 6; /* 'ETag: ' */ + etag.len = etag_hdr.len - 8; /* 'ETag: ' '\r\n' */ if(xcaps_put_db(&turi.user, &turi.host, &xuri, &etag, &body)<0) { @@ -1047,7 +1047,7 @@ done: int xcaps_generate_etag_hdr(str *etag) { etag->len = snprintf(xcaps_etag_buf, XCAPS_ETAG_SIZE, - "SIP-ETag: sr-%d-%d-%d\r\n", xcaps_init_time, my_pid(), + "ETag: sr-%d-%d-%d\r\n", xcaps_init_time, my_pid(), xcaps_etag_counter++); if(etag->len <0) {

13 years, 7 months

git:3.1: seas(k): enable cfg framework for module's extra process

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 25ef2d798ade6827f67b5b5058ba6ef534b8fa15 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25ef2d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:47:55 2011 +0200 seas(k): enable cfg framework for module's extra process (cherry picked from commit 4990dea6ab31e9d0aec78ca09af96a481196cd70) --- modules_k/seas/event_dispatcher.c | 4 ++++ modules_k/seas/seas.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_k/seas/event_dispatcher.c b/modules_k/seas/event_dispatcher.c index 7702c58..7f8cbb3 100644 --- a/modules_k/seas/event_dispatcher.c +++ b/modules_k/seas/event_dispatcher.c @@ -38,6 +38,7 @@ #include "../../mem/shm_mem.h" /*shm_malloc*/ #include "../../dprint.h" /*LM_**/ #include "../../locking.h" +#include "../../cfg/cfg_struct.h" #include "seas.h" #include "ha.h" @@ -129,6 +130,9 @@ int dispatcher_main_loop(void) spawn_pinger(); while(1){ + /* update the local config framework structures */ + cfg_update(); + if(sig_flag==SIGCHLD){ while ((chld=waitpid( -1, &chld_status, WNOHANG ))>0) { if (WIFEXITED(chld_status)){ diff --git a/modules_k/seas/seas.c b/modules_k/seas/seas.c index b1adb9d..c68bffa 100644 --- a/modules_k/seas/seas.c +++ b/modules_k/seas/seas.c @@ -37,6 +37,7 @@ #include "../../modules/tm/tm_load.h" /*load_tm_api*/ #include "../../modules/tm/h_table.h" /*cell*/ #include "../../modules/tm/t_lookup.h" /*T_UNDEFINED*/ +#include "../../cfg/cfg_struct.h" #include "encode_msg.h" /*encode_msg*/ @@ -681,6 +682,9 @@ static int seas_init(void) if(0>parse_cluster_cfg()) goto error; register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); + return 0; error: for(i=0;i<2;i++) @@ -728,6 +732,10 @@ static int seas_child_init(int rank) /*dispatcher child. we leave writing end open so that new childs spawned * by event dispatcher can also write to pipe.. */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + /* close(write_pipe); */ return dispatcher_main_loop(); }

13 years, 7 months

git:3.1: snmpstats(k): enable cfg framework for module's extra process

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 87a95a607533815325ac6628db9339ffb7cdbd21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87a95a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:41:11 2011 +0200 snmpstats(k): enable cfg framework for module's extra process (cherry picked from commit 17e94fd7535f541438e09d9536c8b2767e397f13) --- modules_k/snmpstats/snmpstats.c | 7 +++++++ modules_k/snmpstats/sub_agent.c | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 1994876..37dc829 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -79,6 +79,7 @@ #include "snmpstats.h" #include "snmpstats_globals.h" #include "../../timer.h" +#include "../../cfg/cfg_struct.h" #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> @@ -340,6 +341,8 @@ static int mod_init(void) /* add space for one extra process */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); return 0; } @@ -363,6 +366,10 @@ static int mod_child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + agentx_child(1); return 0; } diff --git a/modules_k/snmpstats/sub_agent.c b/modules_k/snmpstats/sub_agent.c index 24273ec..d35a3de 100644 --- a/modules_k/snmpstats/sub_agent.c +++ b/modules_k/snmpstats/sub_agent.c @@ -65,6 +65,7 @@ #include "snmpMIBNotifications.h" #include "../../dprint.h" +#include "../../cfg/cfg_struct.h" static int keep_running; @@ -110,6 +111,9 @@ static int initialize_agentx(void) keep_running = 1; while(keep_running) { + /* update the local config framework structures */ + cfg_update(); + agent_check_and_process(1); /* 0 == don't block */ }

13 years, 7 months

git:3.1: purple(k): enable cfg framework for module's extra process

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: bef4e7d50b65f3c1db23ea1142d966c366398133 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bef4e7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:34:53 2011 +0200 purple(k): enable cfg framework for module's extra process (cherry picked from commit 11efca600514ba791e456cc809743dd5ec6819c2) --- modules_k/purple/clientpipe.c | 4 ++++ modules_k/purple/purple.c | 6 ++++++ modules_k/purple/purple_sip.c | 9 ++++++++- 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/modules_k/purple/clientpipe.c b/modules_k/purple/clientpipe.c index 2e374fb..489ba8a 100644 --- a/modules_k/purple/clientpipe.c +++ b/modules_k/purple/clientpipe.c @@ -23,6 +23,7 @@ #include <errno.h> #include "../../dprint.h" +#include "../../cfg/cfg_struct.h" #include "purple.h" #include "purplepipe.h" @@ -231,6 +232,9 @@ void pipe_reader(gpointer data, gint fd, PurpleInputCondition condition) { return; } + /* update the local config framework structures */ + cfg_update(); + switch (cmd->type) { case PURPLE_MESSAGE_CMD: LM_DBG("received message cmd via pipe from <%s> to <%s>\n", cmd->message.from, cmd->message.to); diff --git a/modules_k/purple/purple.c b/modules_k/purple/purple.c index f85b9d5..7729ffe 100644 --- a/modules_k/purple/purple.c +++ b/modules_k/purple/purple.c @@ -30,6 +30,7 @@ #include "../../parser/parse_content.h" #include "../../parser/parse_from.h" #include "../../modules/tm/tm_load.h" +#include "../../cfg/cfg_struct.h" #include "../pua/pua_bind.h" #include "../pua/pidf.h" @@ -219,6 +220,8 @@ static int init(void) { /* add space for one extra process */ register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); return 0; } @@ -236,6 +239,9 @@ static int child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; runprocs(1); } } diff --git a/modules_k/purple/purple_sip.c b/modules_k/purple/purple_sip.c index 536f4f8..5b23d89 100644 --- a/modules_k/purple/purple_sip.c +++ b/modules_k/purple/purple_sip.c @@ -23,6 +23,7 @@ #include "../../dprint.h" #include "../../str.h" +#include "../../cfg/cfg_struct.h" #include "../../modules/tm/tm_load.h" #include "../pua/pua_bind.h" #include "../pua/pidf.h" @@ -41,6 +42,9 @@ int purple_send_sip_msg(char *to, char *from, char *msg) { char hdr_buf[512], ruri_buf[512]; uac_req_t uac_r; + /* update the local config framework structures */ + cfg_update(); + ruri.s = ruri_buf; ruri.len = snprintf(ruri_buf, sizeof(ruri_buf), "%s;proto=purple", to); @@ -210,10 +214,13 @@ int purple_send_sip_publish(char *from, char *tupleid, enum purple_publish_basic char pres_buff[512]; publ_info_t publ; + str pres_uri; + + /* update the local config framework structures */ + cfg_update(); memset(&publ, 0, sizeof(publ_info_t)); - str pres_uri; pres_uri.s = pres_buff; pres_uri.len = sprintf(pres_buff, "%s;proto=purple", from);

13 years, 7 months

git:3.1: xmpp(k): enable cfg framework for module's extra process

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 2e9113a87be66da3e2f0119d20095777ecd32223 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e9113a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:18:44 2011 +0200 xmpp(k): enable cfg framework for module's extra process (cherry picked from commit cd3d112dcd6b0c5dd6e66fabc8082b70dcb317ae) --- modules_k/xmpp/xmpp.c | 8 +++++++- modules_k/xmpp/xmpp_component.c | 4 ++++ modules_k/xmpp/xmpp_server.c | 5 +++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/modules_k/xmpp/xmpp.c b/modules_k/xmpp/xmpp.c index e7a0093..ad087e4 100644 --- a/modules_k/xmpp/xmpp.c +++ b/modules_k/xmpp/xmpp.c @@ -118,6 +118,7 @@ #include "../../parser/parse_content.h" #include "../../parser/parse_from.h" #include "../../modules/tm/tm_load.h" +#include "../../cfg/cfg_struct.h" #include "xode.h" #include "xmpp.h" @@ -245,7 +246,8 @@ static int mod_init(void) { /* add space for one extra process */ register_procs(1); - + /* add child to update local config framework structures */ + cfg_register_child(1); return 0; } @@ -263,6 +265,10 @@ static int child_init(int rank) return -1; /* error */ if(pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + xmpp_process(1); } } diff --git a/modules_k/xmpp/xmpp_component.c b/modules_k/xmpp/xmpp_component.c index e93b040..123f11a 100644 --- a/modules_k/xmpp/xmpp_component.c +++ b/modules_k/xmpp/xmpp_component.c @@ -49,6 +49,7 @@ #include <string.h> #include "../../sr_module.h" +#include "../../cfg/cfg_struct.h" #include "xmpp.h" #include "xmpp_api.h" @@ -221,6 +222,9 @@ int xmpp_component_child_process(int data_pipe) maxfd = fd > data_pipe ? fd : data_pipe; rv = select(maxfd + 1, &fdset, NULL, NULL, NULL); + /* update the local config framework structures */ + cfg_update(); + if (rv < 0) { LM_ERR("select() failed: %s\n", strerror(errno)); } else if (!rv) { diff --git a/modules_k/xmpp/xmpp_server.c b/modules_k/xmpp/xmpp_server.c index 74b82a3..cc355b4 100644 --- a/modules_k/xmpp/xmpp_server.c +++ b/modules_k/xmpp/xmpp_server.c @@ -91,6 +91,7 @@ #include <string.h> #include "../../sr_module.h" +#include "../../cfg/cfg_struct.h" #include "xmpp.h" #include "xmpp_api.h" @@ -497,6 +498,10 @@ int xmpp_server_child_process(int data_pipe) } rv = select(FD_SETSIZE, &fdset, NULL, NULL, NULL); + + /* update the local config framework structures */ + cfg_update(); + if (rv < 0) { LM_ERR("select() failed: %s\n", strerror(errno)); } else if (!rv) {

13 years, 7 months

git:3.1: uac(k): enable cfg framework for module's extra process

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 1ad6e142aad3fb4e0229d46dab52ab6ebab7e113 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ad6e14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Apr 10 12:11:07 2011 +0200 uac(k): enable cfg framework for module's extra process (cherry picked from commit db0a6250180226ffaa700b67018ba25eb5451caf) --- modules_k/uac/uac.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules_k/uac/uac.c b/modules_k/uac/uac.c index 105172d..81dfe35 100644 --- a/modules_k/uac/uac.c +++ b/modules_k/uac/uac.c @@ -49,6 +49,7 @@ #include "../../mod_fix.h" #include "../../rpc.h" #include "../../rpc_lookup.h" +#include "../../cfg/cfg_struct.h" #include "../rr/api.h" @@ -257,6 +258,8 @@ static int mod_init(void) } uac_reg_init_db(); register_procs(1); + /* add child to update local config framework structures */ + cfg_register_child(1); } init_from_replacer(); @@ -284,9 +287,16 @@ static int child_init(int rank) } if (pid==0){ /* child */ + /* initialize the config framework */ + if (cfg_child_init()) + return -1; + uac_reg_load_db(); uac_reg_timer(0); for(;;){ + /* update the local config framework structures */ + cfg_update(); + sleep(reg_timer_interval); uac_reg_timer(get_ticks()); }

13 years, 7 months

git:master: xcap_server: use ETag header instead of SIP-ETag

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a20da4ced92796959d619adb6ba61334869f8588 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a20da4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 11 12:02:23 2011 +0200 xcap_server: use ETag header instead of SIP-ETag - over http the name of header carrying entity tag is ETag - patch by Peter Dunkley --- modules_k/xcap_server/xcap_server.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 302221c..92c3178 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -550,8 +550,8 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, LM_ERR("could not generate etag\n"); goto error; } - etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */ - etag.len = etag_hdr.len - 12; /* 'SIP-ETag: ' '\r\n' */ + etag.s = etag_hdr.s + 6; /* 'ETag: ' */ + etag.len = etag_hdr.len - 8; /* 'ETag: ' '\r\n' */ if(xcaps_put_db(&turi.user, &turi.host, &xuri, &etag, &body)<0) { @@ -654,7 +654,7 @@ static int xcaps_get_db(str* user, str *domain, xcap_uri_t *xuri, goto error; } etag->len = snprintf(xcaps_etag_buf, XCAPS_ETAG_SIZE, - "SIP-ETag: %.*s\r\n", s.len, s.s); + "ETag: %.*s\r\n", s.len, s.s); if(etag->len < 0) { LM_ERR("error printing etag hdr\n "); @@ -953,8 +953,8 @@ static int w_xcaps_del(sip_msg_t* msg, char* puri, char* ppath) LM_ERR("could not generate etag\n"); goto error; } - etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */ - etag.len = etag_hdr.len - 12; /* 'SIP-ETag: ' '\r\n' */ + etag.s = etag_hdr.s + 6; /* 'ETag: ' */ + etag.len = etag_hdr.len - 8; /* 'ETag: ' '\r\n' */ if(xcaps_put_db(&turi.user, &turi.host, &xuri, &etag, &body)<0) { @@ -1047,7 +1047,7 @@ done: int xcaps_generate_etag_hdr(str *etag) { etag->len = snprintf(xcaps_etag_buf, XCAPS_ETAG_SIZE, - "SIP-ETag: sr-%d-%d-%d\r\n", xcaps_init_time, my_pid(), + "ETag: sr-%d-%d-%d\r\n", xcaps_init_time, my_pid(), xcaps_etag_counter++); if(etag->len <0) {

13 years, 7 months

Bug in XCAP Server module

by Peter Dunkley

Hello, I've been testing with a commercial presence and XCAP client and have discovered a bug in the XCAP Server module. The HTTP responses sent by the XCAP Server module contain a "SIP-ETag:" header. "SIP-ETag:" is the correct header for SIP, but HTTP responses are supposed to have an "ETag:" header. See RFC 2616 section 14.19. Some clients can do a partial match and work with "SIP-ETag:", but the one I have been testing with is strict and requires the correct header field name. This was a simple fix and I have included a diff below. Regards, Peter # diff xcap_server-3.1.3/ xcap_server/ Common subdirectories: xcap_server-3.1.3/doc and xcap_server/doc diff xcap_server-3.1.3/xcap_server.c xcap_server/xcap_server.c 553,554c553,554 < etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */ < etag.len = etag_hdr.len - 12; /* 'SIP-ETag: ' '\r\n' */ --- > etag.s = etag_hdr.s + 6; /* 'ETag: ' */ > etag.len = etag_hdr.len - 8; /* 'ETag: ' '\r\n' */ 657c657 < "SIP-ETag: %.*s\r\n", s.len, s.s); --- > "ETag: %.*s\r\n", s.len, s.s); 956,957c956,957 < etag.s = etag_hdr.s + 10; /* 'SIP-ETag: ' */ < etag.len = etag_hdr.len - 12; /* 'SIP-ETag: ' '\r\n' */ --- > etag.s = etag_hdr.s + 6; /* 'ETag: ' */ > etag.len = etag_hdr.len - 8; /* 'ETag: ' '\r\n' */ 1050c1050 < "SIP-ETag: sr-%d-%d-%d\r\n", xcaps_init_time, my_pid(), --- > "ETag: sr-%d-%d-%d\r\n", xcaps_init_time, my_pid(), -- Peter Dunkley Technical Director Crocodile RCS Ltd

13 years, 7 months

New developer: Timo Teräs

by Daniel-Constantin Mierla

Hello, just to let everyone know that I grnted developer access to Timo, who submitted recently a patch for adding a new module named db_sqlite. As the name suggests, the new module will allot to use SQLite databases as alternative to existing db drivers such as mysql, postgres, a.s.o. Timo will maintain the new module and may help with other modules, as he previously submitted a patch for uac module. His GIT username for commits is: tteras. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

13 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011