comparison: libpurple/protocols/zephyr/Zinternal.c
libpurple/protocols/zephyr/Zinternal.c
- changeset 40653
- 503cfa50c8c3
- parent 40643
- 1c9bdf8d3e85
- child 40756
- 3a58ef28ee44
equal
deleted
inserted
replaced
| 40652:0006f8158d6e | 40653:503cfa50c8c3 |
|---|---|
| 538 | 538 |
| 539 realtime = g_get_real_time(); | 539 realtime = g_get_real_time(); |
| 540 notice->z_uid.tv.tv_sec = realtime / G_USEC_PER_SEC; | 540 notice->z_uid.tv.tv_sec = realtime / G_USEC_PER_SEC; |
| 541 notice->z_uid.tv.tv_usec = | 541 notice->z_uid.tv.tv_usec = |
| 542 realtime - notice->z_uid.tv.tv_sec * G_USEC_PER_SEC; | 542 realtime - notice->z_uid.tv.tv_sec * G_USEC_PER_SEC; |
| 543 notice->z_uid.tv.tv_sec = htonl((unsigned long)notice->z_uid.tv.tv_sec); | 543 notice->z_uid.tv.tv_sec = GUINT64_TO_BE((guint64)notice->z_uid.tv.tv_sec); |
| 544 notice->z_uid.tv.tv_usec = htonl((unsigned long)notice->z_uid.tv.tv_usec); | 544 notice->z_uid.tv.tv_usec = GUINT64_TO_BE((guint64)notice->z_uid.tv.tv_usec); |
| 545 | 545 |
| 546 memcpy(¬ice->z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); | 546 memcpy(¬ice->z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); |
| 547 | 547 |
| 548 notice->z_multiuid = notice->z_uid; | 548 notice->z_multiuid = notice->z_uid; |
| 549 | 549 |
| 615 if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, | 615 if (ZMakeAscii(ptr, end-ptr, (unsigned char *)¬ice->z_uid, |
| 616 sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN) | 616 sizeof(ZUnique_Id_t)) == ZERR_FIELDLEN) |
| 617 return (ZERR_HEADERLEN); | 617 return (ZERR_HEADERLEN); |
| 618 ptr += strlen(ptr)+1; | 618 ptr += strlen(ptr)+1; |
| 619 | 619 |
| 620 if (ZMakeAscii16(ptr, end-ptr, ntohs(notice->z_port)) == ZERR_FIELDLEN) | 620 if (ZMakeAscii16(ptr, end-ptr, g_ntohs(notice->z_port)) == ZERR_FIELDLEN) |
| 621 return (ZERR_HEADERLEN); | 621 return (ZERR_HEADERLEN); |
| 622 ptr += strlen(ptr)+1; | 622 ptr += strlen(ptr)+1; |
| 623 | 623 |
| 624 if (ZMakeAscii32(ptr, end-ptr, notice->z_auth) == ZERR_FIELDLEN) | 624 if (ZMakeAscii32(ptr, end-ptr, notice->z_auth) == ZERR_FIELDLEN) |
| 625 return (ZERR_HEADERLEN); | 625 return (ZERR_HEADERLEN); |
| 774 gint64 realtime = g_get_real_time(); | 774 gint64 realtime = g_get_real_time(); |
| 775 partnotice.z_uid.tv.tv_sec = realtime / G_USEC_PER_SEC; | 775 partnotice.z_uid.tv.tv_sec = realtime / G_USEC_PER_SEC; |
| 776 partnotice.z_uid.tv.tv_usec = | 776 partnotice.z_uid.tv.tv_usec = |
| 777 realtime - partnotice.z_uid.tv.tv_sec * G_USEC_PER_SEC; | 777 realtime - partnotice.z_uid.tv.tv_sec * G_USEC_PER_SEC; |
| 778 partnotice.z_uid.tv.tv_sec = | 778 partnotice.z_uid.tv.tv_sec = |
| 779 htonl((unsigned long)partnotice.z_uid.tv.tv_sec); | 779 GUINT64_TO_BE((guint64)partnotice.z_uid.tv.tv_sec); |
| 780 partnotice.z_uid.tv.tv_usec = | 780 partnotice.z_uid.tv.tv_usec = |
| 781 htonl((unsigned long)partnotice.z_uid.tv.tv_usec); | 781 GUINT64_TO_BE((guint64)partnotice.z_uid.tv.tv_usec); |
| 782 memcpy(&partnotice.z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); | 782 memcpy(&partnotice.z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); |
| 783 } | 783 } |
| 784 message_len = MIN(notice->z_message_len - offset, fragsize); | 784 message_len = MIN(notice->z_message_len - offset, fragsize); |
| 785 partnotice.z_message = (char*)notice->z_message+offset; | 785 partnotice.z_message = (char*)notice->z_message+offset; |
| 786 partnotice.z_message_len = message_len; | 786 partnotice.z_message_len = message_len; |
