comparison libpurple/nat-pmp.c @ 16907:533ebd404184

Change the nat-pmp code to use glib's integer types instead of those from stdint.h. Also, remove the err.h #include which doesn't seem to be needed.
author Richard Laager <rlaager@wiktel.com>
date Sat, 05 May 2007 14:50:00 +0000
parents 6b4e778ee4b4
children d0e74d0be43f
comparison
equal deleted inserted replaced
16906:b93b9994dc2f 16907:533ebd404184
42 42
43 #include <net/if.h> 43 #include <net/if.h>
44 #include <net/route.h> 44 #include <net/route.h>
45 45
46 #include <netdb.h> 46 #include <netdb.h>
47 #include <err.h>
48 #endif 47 #endif
49 48
50 #include <stdio.h> 49 #include <stdio.h>
51 #include <stdlib.h> 50 #include <stdlib.h>
52 #include <string.h> 51 #include <string.h>
56 #ifdef NET_RT_DUMP 55 #ifdef NET_RT_DUMP
57 56
58 #define PMP_DEBUG 1 57 #define PMP_DEBUG 1
59 58
60 typedef struct { 59 typedef struct {
61 uint8_t version; 60 guint8 version;
62 uint8_t opcode; 61 guint8 opcode;
63 } PurplePmpIpRequest; 62 } PurplePmpIpRequest;
64 63
65 typedef struct { 64 typedef struct {
66 uint8_t version; 65 guint8 version;
67 uint8_t opcode; /* 128 + n */ 66 guint8 opcode; /* 128 + n */
68 uint16_t resultcode; 67 guint16 resultcode;
69 uint32_t epoch; 68 guint32 epoch;
70 uint32_t address; 69 guint32 address;
71 } PurplePmpIpResponse; 70 } PurplePmpIpResponse;
72 71
73 typedef struct { 72 typedef struct {
74 uint8_t version; 73 guint8 version;
75 uint8_t opcode; 74 guint8 opcode;
76 char reserved[2]; 75 char reserved[2];
77 uint16_t privateport; 76 guint16 privateport;
78 uint16_t publicport; 77 guint16 publicport;
79 uint32_t lifetime; 78 guint32 lifetime;
80 } PurplePmpMapRequest; 79 } PurplePmpMapRequest;
81 80
82 struct _PurplePmpMapResponse { 81 struct _PurplePmpMapResponse {
83 uint8_t version; 82 guint8 version;
84 uint8_t opcode; 83 guint8 opcode;
85 uint16_t resultcode; 84 guint16 resultcode;
86 uint32_t epoch; 85 guint32 epoch;
87 uint16_t privateport; 86 guint16 privateport;
88 uint16_t publicport; 87 guint16 publicport;
89 uint32_t lifetime; 88 guint32 lifetime;
90 }; 89 };
91 90
92 typedef struct _PurplePmpMapResponse PurplePmpMapResponse; 91 typedef struct _PurplePmpMapResponse PurplePmpMapResponse;
93 92
94 typedef enum { 93 typedef enum {