#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
/* test records to resolve */
-#define TEST_DOMAIN "_sip._tcp.bob.gads"
+#define TEST_DOMAIN "_sip._tcp.bob.gnu"
#define TEST_IP "127.0.0.1"
#define TEST_RECORD_NAME "sipserver"
#define TEST_RECORD_NAME_SRV "_sip._tcp"
#define TEST_SRV_NAME "sipserver.+"
-#define TEST_EXPECTED_SRV "sipserver.bob.gads"
+#define TEST_EXPECTED_SRV "sipserver.bob.gnu"
#define TEST_AUTHORITY_NAME "bob"
const struct GNUNET_CONFIGURATION_Handle *ccfg,
struct GNUNET_TESTING_Peer *peer)
{
- struct GNUNET_CRYPTO_EccPublicKey alice_pkey;
- struct GNUNET_CRYPTO_EccPublicKey bob_pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey alice_pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey bob_pkey;
struct GNUNET_CRYPTO_EccPrivateKey *alice_key;
struct GNUNET_CRYPTO_EccPrivateKey *bob_key;
struct GNUNET_CRYPTO_ShortHashCode bob_hash;
struct GNUNET_CRYPTO_EccSignature *sig;
char* alice_keyfile;
- struct srv_data *srv_data;
+ struct GNUNET_TUN_DnsSrvRecord *srv_data;
struct GNUNET_TIME_Absolute et;
cfg = ccfg;
alice_key = GNUNET_CRYPTO_ecc_key_create_from_file (alice_keyfile);
bob_key = GNUNET_CRYPTO_ecc_key_create_from_file (KEYFILE_BOB);
- GNUNET_CRYPTO_ecc_key_get_public (alice_key, &alice_pkey);
- GNUNET_CRYPTO_ecc_key_get_public (bob_key, &bob_pkey);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (alice_key, &alice_pkey);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (bob_key, &bob_pkey);
struct GNUNET_NAMESTORE_RecordData rd;
char* ip = TEST_IP;
struct in_addr *sipserver = GNUNET_malloc (sizeof (struct in_addr));
- srv_data = GNUNET_malloc (sizeof (struct srv_data) + strlen (TEST_SRV_NAME) + 1);
+ srv_data = GNUNET_malloc (sizeof (struct GNUNET_TUN_DnsSrvRecord) + strlen (TEST_SRV_NAME) + 1);
uint16_t srv_weight = 60;
uint16_t srv_prio = 50;
uint16_t srv_port = 5060;
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
NULL);
GNUNET_free (sig);
- rd.data_size = sizeof (struct srv_data)+strlen(TEST_SRV_NAME)+1;
+ rd.data_size = sizeof (struct GNUNET_TUN_DnsSrvRecord)+strlen(TEST_SRV_NAME)+1;
srv_data->port = srv_port;
srv_data->prio = srv_prio;
srv_data->weight = srv_weight;
GNUNET_free (srv_data);
GNUNET_free (sipserver);
GNUNET_free (sig);
- GNUNET_CRYPTO_ecc_key_free (bob_key);
- GNUNET_CRYPTO_ecc_key_free (alice_key);
+ GNUNET_free (bob_key);
+ GNUNET_free (alice_key);
}