Changeset 708:de2c260b6f6b in freeDiameter
- Timestamp:
- Feb 10, 2011, 10:24:11 AM (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tests/testappacct.c
r690 r708 85 85 } 86 86 87 #define LOCAL_ID "test.app.acct" 88 #define LOCAL_REALM "app.acct" 89 87 90 /* Main test routine */ 88 91 int main(int argc, char *argv[]) … … 92 95 extern void fd_ext_fini(void); /* defined in the extension itself */ 93 96 struct msg * msg; 94 char * sess_bkp; 97 os0_t sess_bkp; 98 size_t sess_bkp_len; 95 99 96 100 /* First, initialize the daemon modules */ 97 101 INIT_FD(); 98 fd_g_config->cnf_diamid = strdup( "test.app.acct");99 fd_g_config->cnf_diamid_len = strlen(fd_g_config->cnf_diamid);100 fd_g_config->cnf_diamrlm = strdup( "app.acct");101 fd_g_config->cnf_diamrlm_len = strlen(fd_g_config->cnf_diamrlm);102 fd_g_config->cnf_diamid = strdup(LOCAL_ID); 103 fd_g_config->cnf_diamid_len = CONSTSTRLEN(LOCAL_ID); 104 fd_g_config->cnf_diamrlm = strdup(LOCAL_REALM); 105 fd_g_config->cnf_diamrlm_len = CONSTSTRLEN(LOCAL_REALM); 102 106 103 107 CHECK( 0, fd_queues_init() ); … … 166 170 { 167 171 struct session * sess = NULL; 168 char *s;169 CHECK( 0, fd_sess_new( &sess, fd_g_config->cnf_diamid, NULL, 0) );170 CHECK( 0, fd_sess_getsid(sess, &s ) );171 sess_bkp = strdup(s);172 os0_t s; 173 CHECK( 0, fd_sess_new( &sess, fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len, NULL, 0) ); 174 CHECK( 0, fd_sess_getsid(sess, &s, &sess_bkp_len) ); 175 CHECK( 1, (sess_bkp = os0dup(s, sess_bkp_len)) ? 1 : 0); 172 176 173 177 CHECK( 0, fd_dict_search ( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME, "Session-Id", &d, ENOENT ) ); 174 178 CHECK( 0, fd_msg_avp_new ( d, 0, &avp ) ); 175 179 memset(&avp_val, 0, sizeof(avp_val)); 176 avp_val.os.data = (unsigned char *)sess_bkp;177 avp_val.os.len = s trlen(sess_bkp);180 avp_val.os.data = sess_bkp; 181 avp_val.os.len = sess_bkp_len; 178 182 CHECK( 0, fd_msg_avp_setvalue ( avp, &avp_val ) ); 179 183 CHECK( 0, fd_msg_avp_add ( msg, MSG_BRW_FIRST_CHILD, avp) ); … … 233 237 234 238 /* Source */ 235 CHECK( 0, fd_msg_source_set( msg, "peer3", 1, fd_g_config->cnf_dict ) );239 CHECK( 0, fd_msg_source_set( msg, "peer3", CONSTSTRLEN("peer3"), 1, fd_g_config->cnf_dict ) ); 236 240 } 237 241 … … 253 257 /* We also check that the Session-Id we retrieve is the same as what we generated earlier (not trashed in the process) */ 254 258 s = PQgetvalue(res, 0, 0); 255 CHECK( 0, strcmp(s, sess_bkp) );259 CHECK( 0, strcmp(s, (char *)sess_bkp) ); 256 260 257 261 PQclear(res);
Note: See TracChangeset
for help on using the changeset viewer.