diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-04-10 13:02:28 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-04-10 13:02:51 +0200 |
commit | 0cd0e3a5287af73bb81219ebc9548395a8945ce8 (patch) | |
tree | b5bb24d78a4eed519b37e6fb8f9291a6282d06d4 /src/dns | |
parent | 3eae3e43d6f94449cb89998a676e6696438cc604 (diff) | |
download | gnunet-0cd0e3a5287af73bb81219ebc9548395a8945ce8.tar.gz gnunet-0cd0e3a5287af73bb81219ebc9548395a8945ce8.zip |
more work on gnunet-zoneimport, some bugfix in flat namestore, misc. style fixes
Diffstat (limited to 'src/dns')
-rw-r--r-- | src/dns/dnsparser.c | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c index ab833f7c5..7e200ee7c 100644 --- a/src/dns/dnsparser.c +++ b/src/dns/dnsparser.c | |||
@@ -919,9 +919,14 @@ GNUNET_DNSPARSER_builder_add_mx (char *dst, | |||
919 | if (*off + sizeof (uint16_t) > dst_len) | 919 | if (*off + sizeof (uint16_t) > dst_len) |
920 | return GNUNET_NO; | 920 | return GNUNET_NO; |
921 | mxpref = htons (mx->preference); | 921 | mxpref = htons (mx->preference); |
922 | GNUNET_memcpy (&dst[*off], &mxpref, sizeof (mxpref)); | 922 | GNUNET_memcpy (&dst[*off], |
923 | &mxpref, | ||
924 | sizeof (mxpref)); | ||
923 | (*off) += sizeof (mxpref); | 925 | (*off) += sizeof (mxpref); |
924 | return GNUNET_DNSPARSER_builder_add_name (dst, dst_len, off, mx->mxhost); | 926 | return GNUNET_DNSPARSER_builder_add_name (dst, |
927 | dst_len, | ||
928 | off, | ||
929 | mx->mxhost); | ||
925 | } | 930 | } |
926 | 931 | ||
927 | 932 | ||
@@ -1081,21 +1086,36 @@ add_record (char *dst, | |||
1081 | switch (record->type) | 1086 | switch (record->type) |
1082 | { | 1087 | { |
1083 | case GNUNET_DNSPARSER_TYPE_MX: | 1088 | case GNUNET_DNSPARSER_TYPE_MX: |
1084 | ret = GNUNET_DNSPARSER_builder_add_mx (dst, dst_len, &pos, record->data.mx); | 1089 | ret = GNUNET_DNSPARSER_builder_add_mx (dst, |
1090 | dst_len, | ||
1091 | &pos, | ||
1092 | record->data.mx); | ||
1085 | break; | 1093 | break; |
1086 | case GNUNET_DNSPARSER_TYPE_CERT: | 1094 | case GNUNET_DNSPARSER_TYPE_CERT: |
1087 | ret = GNUNET_DNSPARSER_builder_add_cert (dst, dst_len, &pos, record->data.cert); | 1095 | ret = GNUNET_DNSPARSER_builder_add_cert (dst, |
1096 | dst_len, | ||
1097 | &pos, | ||
1098 | record->data.cert); | ||
1088 | break; | 1099 | break; |
1089 | case GNUNET_DNSPARSER_TYPE_SOA: | 1100 | case GNUNET_DNSPARSER_TYPE_SOA: |
1090 | ret = GNUNET_DNSPARSER_builder_add_soa (dst, dst_len, &pos, record->data.soa); | 1101 | ret = GNUNET_DNSPARSER_builder_add_soa (dst, |
1102 | dst_len, | ||
1103 | &pos, | ||
1104 | record->data.soa); | ||
1091 | break; | 1105 | break; |
1092 | case GNUNET_DNSPARSER_TYPE_NS: | 1106 | case GNUNET_DNSPARSER_TYPE_NS: |
1093 | case GNUNET_DNSPARSER_TYPE_CNAME: | 1107 | case GNUNET_DNSPARSER_TYPE_CNAME: |
1094 | case GNUNET_DNSPARSER_TYPE_PTR: | 1108 | case GNUNET_DNSPARSER_TYPE_PTR: |
1095 | ret = GNUNET_DNSPARSER_builder_add_name (dst, dst_len, &pos, record->data.hostname); | 1109 | ret = GNUNET_DNSPARSER_builder_add_name (dst, |
1110 | dst_len, | ||
1111 | &pos, | ||
1112 | record->data.hostname); | ||
1096 | break; | 1113 | break; |
1097 | case GNUNET_DNSPARSER_TYPE_SRV: | 1114 | case GNUNET_DNSPARSER_TYPE_SRV: |
1098 | ret = GNUNET_DNSPARSER_builder_add_srv (dst, dst_len, &pos, record->data.srv); | 1115 | ret = GNUNET_DNSPARSER_builder_add_srv (dst, |
1116 | dst_len, | ||
1117 | &pos, | ||
1118 | record->data.srv); | ||
1099 | break; | 1119 | break; |
1100 | default: | 1120 | default: |
1101 | if (pos + record->data.raw.data_len > dst_len) | 1121 | if (pos + record->data.raw.data_len > dst_len) |
@@ -1103,7 +1123,9 @@ add_record (char *dst, | |||
1103 | ret = GNUNET_NO; | 1123 | ret = GNUNET_NO; |
1104 | break; | 1124 | break; |
1105 | } | 1125 | } |
1106 | GNUNET_memcpy (&dst[pos], record->data.raw.data, record->data.raw.data_len); | 1126 | GNUNET_memcpy (&dst[pos], |
1127 | record->data.raw.data, | ||
1128 | record->data.raw.data_len); | ||
1107 | pos += record->data.raw.data_len; | 1129 | pos += record->data.raw.data_len; |
1108 | ret = GNUNET_OK; | 1130 | ret = GNUNET_OK; |
1109 | break; | 1131 | break; |