diff options
| -rw-r--r-- | include/stellar/session.h | 1 | ||||
| -rw-r--r-- | src/adapter/adapter.c | 13 | ||||
| -rw-r--r-- | src/adapter/adapter.h | 1 | ||||
| -rw-r--r-- | src/adapter/session_manager.c | 17 | ||||
| -rw-r--r-- | src/adapter/session_manager.h | 1 | ||||
| -rw-r--r-- | src/stellar_on_sapp/defer_loader.inf | 4 | ||||
| -rw-r--r-- | src/stellar_on_sapp/start_loader.inf | 4 | ||||
| -rw-r--r-- | src/stellar_on_sapp/stellar_on_sapp.c | 13 | ||||
| -rw-r--r-- | src/stellar_on_sapp/version.map | 2 |
9 files changed, 0 insertions, 56 deletions
diff --git a/include/stellar/session.h b/include/stellar/session.h index 82dcca8..06a0caa 100644 --- a/include/stellar/session.h +++ b/include/stellar/session.h @@ -139,7 +139,6 @@ struct session_event; int stellar_plugin_register(struct stellar *st, int events, session_event_cb_func *cb, void *cb_arg);// register intrinsic event struct session_event *session_get_intrinsic_event(struct session *sess, int plugin_id); -void session_plugin_detach_others(struct session *sess, int plugin_id); #include <sys/time.h> diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index 16558fd..ad90236 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -198,15 +198,6 @@ void adapter_session_free(struct session *sess) return session_free(sess); } -int adapter_session_get_detach_others(struct session *sess) -{ - if(sess) - { - return sess->set_detach_others; - } - return 0; -} - unsigned char adapter_session_state_update(struct streaminfo *stream, struct session *sess, void *a_packet, enum session_state state) { struct packet *pkt = NULL; @@ -215,10 +206,6 @@ unsigned char adapter_session_state_update(struct streaminfo *stream, struct ses pkt=(struct packet *)session_get0_current_packet(sess); pkt->raw_pkt=(void *)get_current_rawpkt_from_streaminfo(stream); session_dispatch( sess, state, pkt); - if(adapter_session_get_detach_others(sess) == 1) - { - return APP_STATE_GIVEME|APP_STATE_KILL_OTHER; - } return APP_STATE_GIVEME; } else diff --git a/src/adapter/adapter.h b/src/adapter/adapter.h index f4e6a5d..3559f1a 100644 --- a/src/adapter/adapter.h +++ b/src/adapter/adapter.h @@ -13,6 +13,5 @@ struct session *adapter_session_new(struct stellar *st, struct streaminfo *strea void adapter_session_free(struct session *sess); unsigned char adapter_session_state_update(struct streaminfo *stream, struct session *sess, void *a_packet, enum session_state state); -int adapter_session_get_detach_others(struct session *sess); void adapter_session_poll(struct session *sess);
\ No newline at end of file diff --git a/src/adapter/session_manager.c b/src/adapter/session_manager.c index 368feff..594bd63 100644 --- a/src/adapter/session_manager.c +++ b/src/adapter/session_manager.c @@ -354,23 +354,6 @@ void session_dispatch(struct session *sess, enum session_state state, struct pa return; } -void session_plugin_detach_others(struct session *sess, int plugin_id) -{ - struct session_event *intrinsic_events = sess->intrinsic_events; - if(sess->st->plugin_specs_array == NULL)return; - if(sess->st->intrinsic_session_event_schema_array == NULL)return; - unsigned int len = utarray_len(sess->st->intrinsic_session_event_schema_array); - for(unsigned int i = 0; i < len; i++) - { - if((int)i!=plugin_id) - { - (intrinsic_events+i)->events = 0; - } - } - sess->set_detach_others=1; - return; -} - static struct session_event* session_intrinsic_events_init(struct stellar *st, struct session *sess) { if(st->intrinsic_session_event_schema_array == NULL)return NULL; diff --git a/src/adapter/session_manager.h b/src/adapter/session_manager.h index cf8f140..f566bfe 100644 --- a/src/adapter/session_manager.h +++ b/src/adapter/session_manager.h @@ -24,7 +24,6 @@ struct session struct session_mq *mq; char *mq_sub_status; struct session_event *ev_list; - uint64_t set_detach_others; }; struct session *session_new(struct stellar *st, enum session_type type, int thread_id); diff --git a/src/stellar_on_sapp/defer_loader.inf b/src/stellar_on_sapp/defer_loader.inf index ebe9dc1..f823103 100644 --- a/src/stellar_on_sapp/defer_loader.inf +++ b/src/stellar_on_sapp/defer_loader.inf @@ -12,10 +12,6 @@ FUNC_NAME=stellar_on_sapp_defer_entry #FUNC_FLAG=ALL #FUNC_NAME=stellar_on_sapp_defer_entry -#[TCP] -#FUNC_FLAG=ALL -#FUNC_NAME=stellar_on_sapp_detach_check_entry - [UDP] FUNC_FLAG=ALL FUNC_NAME=stellar_on_sapp_defer_entry
\ No newline at end of file diff --git a/src/stellar_on_sapp/start_loader.inf b/src/stellar_on_sapp/start_loader.inf index 3cfe7c6..f966457 100644 --- a/src/stellar_on_sapp/start_loader.inf +++ b/src/stellar_on_sapp/start_loader.inf @@ -12,10 +12,6 @@ FUNC_NAME=stellar_on_sapp_tcpall_entry #FUNC_FLAG=ALL #FUNC_NAME=stellar_on_sapp_tcp_entry -#[TCP] -#FUNC_FLAG=ALL -#FUNC_NAME=stellar_on_sapp_detach_check_entry - [UDP] FUNC_FLAG=ALL FUNC_NAME=stellar_on_sapp_udp_entry
\ No newline at end of file diff --git a/src/stellar_on_sapp/stellar_on_sapp.c b/src/stellar_on_sapp/stellar_on_sapp.c index dd0d834..af3ed91 100644 --- a/src/stellar_on_sapp/stellar_on_sapp.c +++ b/src/stellar_on_sapp/stellar_on_sapp.c @@ -179,19 +179,6 @@ unsigned char stellar_on_sapp_tcpall_entry(struct streaminfo *pstream,void **pme return loader_transfer_stream_entry(pstream, pstream->pktstate, pme, thread_seq, a_packet); } -unsigned char stellar_on_sapp_detach_check_entry(struct streaminfo *pstream,void **pme, int thread_seq,void *a_packet) -{ - struct session *sess=(struct session *)stream_bridge_async_data_get(pstream, g_session_bridge_id); - if(adapter_session_get_detach_others(sess) == 1) - { - return APP_STATE_DROPME|APP_STATE_KILL_OTHER; - } - else - { - return APP_STATE_GIVEME; - } -} - unsigned char stellar_on_sapp_tcp_entry(struct streaminfo *pstream,void **pme, int thread_seq,void *a_packet) { return loader_transfer_stream_entry(pstream, pstream->opstate, pme, thread_seq, a_packet); diff --git a/src/stellar_on_sapp/version.map b/src/stellar_on_sapp/version.map index d02ef63..32bdd9d 100644 --- a/src/stellar_on_sapp/version.map +++ b/src/stellar_on_sapp/version.map @@ -8,7 +8,6 @@ STELLAR_DEFER_LOADER_INIT; STELLAR_DEFER_LOADER_EXIT; stellar_on_sapp_defer_entry; - stellar_on_sapp_detach_check_entry; stellar_get_worker_thread_num; stellar_get_current_thread_id; @@ -25,7 +24,6 @@ session_get*; session_set_*; session_event_*; - session_plugin_detach_others; local: *; /* Hide all other symbols */ |