summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--protocol.c51
-rw-r--r--udp.c26
2 files changed, 16 insertions, 61 deletions
diff --git a/protocol.c b/protocol.c
index e0220d1..a207494 100644
--- a/protocol.c
+++ b/protocol.c
@@ -45,18 +45,14 @@ int init_packet(struct mt_packet *packet, enum mt_ptype ptype, unsigned char *sr
if (mt_direction_fromserver) {
/* Session key */
-#if BYTE_ORDER == LITTLE_ENDIAN
sessionkey = htons(sessionkey);
-#endif
memcpy(data + 16, &sessionkey, sizeof(sessionkey));
/* Client type: Mac Telnet */
memcpy(data + 14, &mt_mactelnet_clienttype, sizeof(mt_mactelnet_clienttype));
} else {
/* Session key */
-#if BYTE_ORDER == LITTLE_ENDIAN
sessionkey = htons(sessionkey);
-#endif
memcpy(data + 14, &sessionkey, sizeof(sessionkey));
/* Client type: Mac Telnet */
@@ -64,9 +60,7 @@ int init_packet(struct mt_packet *packet, enum mt_ptype ptype, unsigned char *sr
}
/* Received/sent data counter */
-#if BYTE_ORDER == LITTLE_ENDIAN
counter = htonl(counter);
-#endif
memcpy(data + 18, &counter, sizeof(counter));
/* 22 bytes header */
@@ -105,7 +99,7 @@ int add_control_packet(struct mt_packet *packet, enum mt_cptype cptype, void *cp
templen = htonl(templen);
memcpy(data + 5, &templen, sizeof(templen));
#else
- #pragma unused(templen)
+#pragma unused(templen)
memcpy(data + 5, &data_len, sizeof(data_len));
#endif
@@ -169,9 +163,8 @@ void parse_packet(unsigned char *data, struct mt_mactelnet_hdr *pkthdr) {
if (mt_direction_fromserver) {
/* Session key */
memcpy(&(pkthdr->seskey), data + 14, sizeof(pkthdr->seskey));
-#if BYTE_ORDER == LITTLE_ENDIAN
pkthdr->seskey = ntohs(pkthdr->seskey);
-#endif
+
/* server type */
memcpy(&(pkthdr->clienttype), data+16, 2);
} else {
@@ -180,16 +173,12 @@ void parse_packet(unsigned char *data, struct mt_mactelnet_hdr *pkthdr) {
/* Session key */
memcpy(&(pkthdr->seskey), data + 16, sizeof(pkthdr->seskey));
-#if BYTE_ORDER == LITTLE_ENDIAN
pkthdr->seskey = ntohs(pkthdr->seskey);
-#endif
}
/* Received/sent data counter */
memcpy(&(pkthdr->counter), data + 18, sizeof(pkthdr->counter));
-#if BYTE_ORDER == LITTLE_ENDIAN
pkthdr->counter = ntohl(pkthdr->counter);
-#endif
/* Set pointer to actual data */
pkthdr->data = data + 22;
@@ -229,9 +218,7 @@ int parse_control_packet(unsigned char *packetdata, int data_len, struct mt_mact
/* Control packet data length */
memcpy(&(cpkthdr->length), data + 5, sizeof(cpkthdr->length));
-#if BYTE_ORDER == LITTLE_ENDIAN
cpkthdr->length = ntohl(cpkthdr->length);
-#endif
/* Set pointer to actual data */
cpkthdr->data = data + 9;
@@ -279,17 +266,10 @@ int mndp_add_attribute(struct mt_packet *packet, enum mt_mndp_attrtype attrtype,
return -1;
}
- /* TODO: Should check all host-to-network/network-to-host conversions in code
- * and add defines to check the current host's endianness.
- */
-#if BYTE_ORDER == LITTLE_ENDIAN
type = htons(type);
-#endif
memcpy(data, &type, sizeof(type));
-#if BYTE_ORDER == LITTLE_ENDIAN
len = htons(len);
-#endif
memcpy(data + 2, &len, sizeof(len));
memcpy(data + 4, attrdata, data_len);
@@ -324,10 +304,9 @@ struct mt_mndp_info *parse_mndp(const unsigned char *data, const int packet_len)
memcpy(&type, p, 2);
memcpy(&len, p + 2, 2);
-#if BYTE_ORDER == LITTLE_ENDIAN
type = ntohs(type);
len = ntohs(len);
-#endif
+
p += 4;
switch (type) {
@@ -366,9 +345,14 @@ struct mt_mndp_info *parse_mndp(const unsigned char *data, const int packet_len)
case MT_MNDPTYPE_TIMESTAMP:
memcpy(&(packet.uptime), p, 4);
-/* Seems like ping uptime is transmitted as small endian? */
+/* Seems like ping uptime is transmitted as little endian? */
#if BYTE_ORDER == BIG_ENDIAN
- packet.uptime = ntohl(packet.uptime);
+ packet.uptime = (
+ ((packet.uptime & 0x000000FF) << 24) +
+ ((packet.uptime & 0x0000FF00) << 8) +
+ ((packet.uptime & 0x00FF0000) >> 8) +
+ ((packet.uptime & 0xFF000000) >> 24)
+ );
#endif
break;
@@ -390,8 +374,9 @@ struct mt_mndp_info *parse_mndp(const unsigned char *data, const int packet_len)
packet.softid[len] = '\0';
break;
- //default:
- // Unhandled MNDP type
+ /*default:
+ Unhandled MNDP type
+ */
}
p += len;
@@ -423,13 +408,8 @@ int query_mndp(const char *identity, unsigned char *mac) {
/* Set initialize address/port */
memset((char *) &si_me, 0, sizeof(si_me));
si_me.sin_family = AF_INET;
-#if BYTE_ORDER == LITTLE_ENDIAN
si_me.sin_port = htons(MT_MNDP_PORT);
si_me.sin_addr.s_addr = htonl(INADDR_ANY);
-#else
- si_me.sin_port = MT_MNDP_PORT;
- si_me.sin_addr.s_addr = INADDR_ANY;
-#endif
/* Bind to specified address/port */
if (bind(sock, (struct sockaddr *)&si_me, sizeof(si_me)) == -1) {
@@ -444,13 +424,8 @@ int query_mndp(const char *identity, unsigned char *mac) {
/* Request routers identify themselves */
memset((char *) &si_remote, 0, sizeof(si_remote));
si_remote.sin_family = AF_INET;
-#if BYTE_ORDER == LITTLE_ENDIAN
si_remote.sin_port = htons(MT_MNDP_PORT);
si_remote.sin_addr.s_addr = htonl(INADDR_BROADCAST);
-#else
- si_remote.sin_port = MT_MNDP_PORT;
- si_remote.sin_addr.s_addr = INADDR_BROADCAST;
-#endif
if (sendto(sock, &message, sizeof (message), 0, (struct sockaddr *)&si_remote, sizeof(si_remote)) == -1) {
fprintf(stderr, "Unable to send broadcast packet: Router lookup will be slow\n");
diff --git a/udp.c b/udp.c
index 2f8b60f..d7ffca0 100644
--- a/udp.c
+++ b/udp.c
@@ -65,16 +65,15 @@ unsigned short udp_sum_calc(unsigned char *src_addr,unsigned char *dst_addr, uns
sum += word16;
}
- len = len;
sum += prot_udp + len;
while (sum>>16)
- sum = (sum & 0xFFFF)+(sum >> 16);
+ sum = (sum & 0xFFFF) + (sum >> 16);
sum = ~sum;
- if (sum == 0)
- sum = 0xffff;
+ if ((unsigned short)sum == 0)
+ sum = 0xFFFF;
return (unsigned short) sum;
}
@@ -114,11 +113,7 @@ int send_custom_udp(const int socket, const int ifindex, const unsigned char *so
/* Init SendTo struct */
socket_address.sll_family = PF_PACKET;
-#if BYTE_ORDER == LITTLE_ENDIAN
socket_address.sll_protocol = htons(ETH_P_IP);
-#else
- socket_address.sll_protocol = ETH_P_IP;
-#endif
socket_address.sll_ifindex = ifindex;
socket_address.sll_hatype = ARPHRD_ETHER;
socket_address.sll_pkttype = PACKET_OTHERHOST;
@@ -132,15 +127,9 @@ int send_custom_udp(const int socket, const int ifindex, const unsigned char *so
ip->version = 4;
ip->ihl = 5;
ip->tos = 0x10;
-#if BYTE_ORDER == LITTLE_ENDIAN
ip->tot_len = htons(datalen + 8 + 20);
ip->id = htons(id++);
ip->frag_off = htons(0x4000);
-#else
- ip->tot_len = datalen + 8 + 20;
- ip->id = id++;
- ip->frag_off = 0x4000;
-#endif
ip->ttl = 64;
ip->protocol = 17; /* UDP */
ip->check = 0x0000;
@@ -151,26 +140,17 @@ int send_custom_udp(const int socket, const int ifindex, const unsigned char *so
ip->check = in_cksum((unsigned short *)ip, sizeof(struct iphdr));
/* Init UDP Header */
-#if BYTE_ORDER == LITTLE_ENDIAN
udp->source = htons(sourceport);
udp->dest = htons(destport);
udp->len = htons(sizeof(struct udphdr) + datalen);
udp->check = 0;
-#else
- udp->source = sourceport;
- udp->dest = destport;
- udp->check = 0;
- udp->len = sizeof(struct udphdr) + datalen;
-#endif
/* Insert actual data */
memcpy(rest, data, datalen);
/* Add UDP checksum */
udp->check = udp_sum_calc((unsigned char *)&(ip->saddr), (unsigned char *)&(ip->daddr), (unsigned char *)udp, sizeof(struct udphdr) + datalen);
-#if BYTE_ORDER == LITTLE_ENDIAN
udp->check = htons(udp->check);
-#endif
/* Send the packet */
send_result = sendto(socket, buffer, datalen+8+14+20, 0, (struct sockaddr*)&socket_address, sizeof(socket_address));
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 22:12:09 +0000