Changeset 10333
- Timestamp:
- 01/27/15 01:26:19 (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cacheex.h
r10228 r10333 65 65 void cacheex_push_out(struct s_client *cl, ECM_REQUEST *er); 66 66 bool cacheex_check_queue_length(struct s_client *cl); 67 static inline int8_t cacheex_get_rdr_mode(struct s_reader *reader) { return reader->cacheex.mode; } 67 68 68 69 #else … … 87 88 static inline void cacheex_push_out(struct s_client *UNUSED(cl), ECM_REQUEST *UNUSED(er)) { } 88 89 static inline bool cacheex_check_queue_length(struct s_client *UNUSED(cl)) { return 0; } 90 static inline int8_t cacheex_get_rdr_mode(struct s_reader *UNUSED(reader)) { return 0; } 89 91 #endif 90 92 -
trunk/module-camd35.c
r10332 r10333 1096 1096 } 1097 1097 1098 #else 1099 static inline void camd35_cache_push_request_remote_id(struct s_client *UNUSED(cl)) { } 1100 static inline void camd35_cache_send_push_filter(struct s_client *UNUSED(cl), uint8_t UNUSED(mode)) { } 1098 1101 #endif 1099 1102 … … 1109 1112 if(tcp_connect(cl)) 1110 1113 { 1111 #ifdef CS_CACHEEX 1112 if(cl->reader->cacheex.mode>1){1114 if(cacheex_get_rdr_mode(cl->reader) > 1) 1115 { 1113 1116 camd35_cache_push_request_remote_id(cl); 1114 1117 return; 1115 1118 } 1116 #endif1117 1118 1119 uint8_t rbuf[32];//minimal size 1119 1120 memset(rbuf, 0, sizeof(rbuf)); … … 1155 1156 send_keepalive(cl); 1156 1157 1157 #ifdef CS_CACHEEX 1158 if(cl->reader->cacheex.mode==2) 1158 if(cacheex_get_rdr_mode(cl->reader) == 2) 1159 1159 camd35_cache_send_push_filter(cl, 2); 1160 #endif1161 1160 1162 1161 return(0);
Note:
See TracChangeset
for help on using the changeset viewer.