Changeset e7f6389 in mainline for uspace/srv/net/netif/lo/lo.c
- Timestamp:
- 2010-10-26T22:45:19Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- f2d2c604
- Parents:
- e503d3a9 (diff), 3cd95ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/netif/lo/lo.c
re503d3a9 re7f6389 28 28 29 29 /** @addtogroup lo 30 * 30 * @{ 31 31 */ 32 32 33 33 /** @file 34 * 34 * Loopback network interface implementation. 35 35 */ 36 36 … … 53 53 #include <netif_local.h> 54 54 55 /** Default hardware address. 56 */ 55 /** Default hardware address. */ 57 56 #define DEFAULT_ADDR "\0\0\0\0\0\0" 58 57 59 /** Default address length. 60 */ 58 /** Default address length. */ 61 59 #define DEFAULT_ADDR_LEN (sizeof(DEFAULT_ADDR) / sizeof(char)) 62 60 63 /** Loopback module name. 64 */ 61 /** Loopback module name. */ 65 62 #define NAME "lo" 66 63 67 /** Network interface global data. 68 */ 64 /** Network interface global data. */ 69 65 netif_globals_t netif_globals; 70 66 71 /** Changes the loopback state. 72 * @param[in] device The device structure. 73 * @param[in] state The new device state. 74 * @returns The new state if changed. 75 * @returns EOK otherwise. 76 */ 77 int change_state_message(netif_device_t * device, device_state_t state); 78 79 /** Creates and returns the loopback network interface structure. 80 * @param[in] device_id The new devce identifier. 81 * @param[out] device The device structure. 82 * @returns EOK on success. 83 * @returns EXDEV if one loopback network interface already exists. 84 * @returns ENOMEM if there is not enough memory left. 85 */ 86 int create(device_id_t device_id, netif_device_t * * device); 87 88 int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ 67 int 68 netif_specific_message(ipc_callid_t callid, ipc_call_t *call, 69 ipc_call_t *answer, int *answer_count) 70 { 89 71 return ENOTSUP; 90 72 } 91 73 92 int netif_get_addr_message(device_id_t device_id, measured_string_ref address){ 93 if(! address){ 74 int netif_get_addr_message(device_id_t device_id, measured_string_ref address) 75 { 76 if (!address) 94 77 return EBADMEM; 95 }96 78 address->value = str_dup(DEFAULT_ADDR); 97 79 address->length = DEFAULT_ADDR_LEN; … … 99 81 } 100 82 101 int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){ 102 ERROR_DECLARE; 103 104 netif_device_t * device; 105 106 if(! stats){ 83 int netif_get_device_stats(device_id_t device_id, device_stats_ref stats) 84 { 85 ERROR_DECLARE; 86 87 netif_device_t *device; 88 89 if (!stats) 107 90 return EBADMEM; 108 }109 91 ERROR_PROPAGATE(find_device(device_id, &device)); 110 memcpy(stats, (device_stats_ref) device->specific, sizeof(device_stats_t)); 111 return EOK; 112 } 113 114 int change_state_message(netif_device_t * device, device_state_t state) 92 memcpy(stats, (device_stats_ref) device->specific, 93 sizeof(device_stats_t)); 94 return EOK; 95 } 96 97 /** Changes the loopback state. 98 * 99 * @param[in] device The device structure. 100 * @param[in] state The new device state. 101 * @returns The new state if changed. 102 * @returns EOK otherwise. 103 */ 104 static int change_state_message(netif_device_t *device, device_state_t state) 115 105 { 116 106 if (device->state != state) { … … 126 116 } 127 117 128 int create(device_id_t device_id, netif_device_t * * device){ 118 /** Creates and returns the loopback network interface structure. 119 * 120 * @param[in] device_id The new devce identifier. 121 * @param[out] device The device structure. 122 * @returns EOK on success. 123 * @returns EXDEV if one loopback network interface already exists. 124 * @returns ENOMEM if there is not enough memory left. 125 */ 126 static int create(device_id_t device_id, netif_device_t **device) 127 { 129 128 int index; 130 129 131 if (netif_device_map_count(&netif_globals.device_map) > 0){130 if (netif_device_map_count(&netif_globals.device_map) > 0) 132 131 return EXDEV; 133 }else{ 134 *device = (netif_device_t *) malloc(sizeof(netif_device_t)); 135 if(!(*device)){ 136 return ENOMEM; 137 } 138 (** device).specific = malloc(sizeof(device_stats_t)); 139 if(! (** device).specific){ 140 free(*device); 141 return ENOMEM; 142 } 143 null_device_stats((device_stats_ref)(** device).specific); 144 (** device).device_id = device_id; 145 (** device).nil_phone = -1; 146 (** device).state = NETIF_STOPPED; 147 index = netif_device_map_add(&netif_globals.device_map, (** device).device_id, * device); 148 if(index < 0){ 149 free(*device); 150 free((** device).specific); 151 *device = NULL; 152 return index; 153 } 154 } 155 return EOK; 156 } 157 158 int netif_initialize(void){ 132 133 *device = (netif_device_t *) malloc(sizeof(netif_device_t)); 134 if (!*device) 135 return ENOMEM; 136 (*device)->specific = (device_stats_t *) malloc(sizeof(device_stats_t)); 137 if (!(*device)->specific) { 138 free(*device); 139 return ENOMEM; 140 } 141 null_device_stats((device_stats_ref) (*device)->specific); 142 (*device)->device_id = device_id; 143 (*device)->nil_phone = -1; 144 (*device)->state = NETIF_STOPPED; 145 index = netif_device_map_add(&netif_globals.device_map, 146 (*device)->device_id, *device); 147 if (index < 0) { 148 free(*device); 149 free((*device)->specific); 150 *device = NULL; 151 return index; 152 } 153 154 return EOK; 155 } 156 157 int netif_initialize(void) 158 { 159 159 ipcarg_t phonehash; 160 160 … … 162 162 } 163 163 164 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io){ 165 ERROR_DECLARE; 166 167 netif_device_t * device; 164 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io) 165 { 166 ERROR_DECLARE; 167 168 netif_device_t *device; 168 169 169 170 // create a new device … … 174 175 } 175 176 176 int netif_send_message(device_id_t device_id, packet_t packet, services_t sender){ 177 ERROR_DECLARE; 178 179 netif_device_t * device; 177 int netif_send_message(device_id_t device_id, packet_t packet, services_t sender) 178 { 179 ERROR_DECLARE; 180 181 netif_device_t *device; 180 182 size_t length; 181 183 packet_t next; … … 183 185 184 186 ERROR_PROPAGATE(find_device(device_id, &device)); 185 if (device->state != NETIF_ACTIVE){187 if (device->state != NETIF_ACTIVE) { 186 188 netif_pq_release(packet_get_id(packet)); 187 189 return EFORWARD; 188 190 } 189 191 next = packet; 190 do {191 ++ ((device_stats_ref) device->specific)->send_packets;192 ++ ((device_stats_ref) device->specific)->receive_packets;192 do { 193 ((device_stats_ref) device->specific)->send_packets++; 194 ((device_stats_ref) device->specific)->receive_packets++; 193 195 length = packet_get_data_length(next); 194 196 ((device_stats_ref) device->specific)->send_bytes += length; 195 197 ((device_stats_ref) device->specific)->receive_bytes += length; 196 198 next = pq_next(next); 197 } while(next);199 } while(next); 198 200 phone = device->nil_phone; 199 201 fibril_rwlock_write_unlock(&netif_globals.lock); 200 202 nil_received_msg(phone, device_id, packet, sender); 201 203 fibril_rwlock_write_lock(&netif_globals.lock); 202 return EOK; 203 } 204 205 int netif_start_message(netif_device_t * device){ 204 205 return EOK; 206 } 207 208 int netif_start_message(netif_device_t *device) 209 { 206 210 return change_state_message(device, NETIF_ACTIVE); 207 211 } 208 212 209 int netif_stop_message(netif_device_t * device){ 213 int netif_stop_message(netif_device_t *device) 214 { 210 215 return change_state_message(device, NETIF_STOPPED); 211 216 } … … 213 218 /** Default thread for new connections. 214 219 * 215 * @param[in] iid The initial message identifier. 216 * @param[in] icall The initial message call structure. 217 * 220 * @param[in] iid The initial message identifier. 221 * @param[in] icall The initial message call structure. 218 222 */ 219 223 static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall) … … 225 229 ipc_answer_0(iid, EOK); 226 230 227 while (true) {231 while (true) { 228 232 ipc_call_t answer; 229 233 int answer_count; … … 240 244 &answer_count); 241 245 242 /* End if said to either by the message or the processing result */ 243 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP)) 246 /* 247 * End if told to either by the message or the processing 248 * result. 249 */ 250 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || 251 (res == EHANGUP)) 244 252 return; 245 253 … … 254 262 255 263 /* Start the module */ 256 if (ERROR_OCCURRED(netif_module_start(netif_client_connection))) 257 return ERROR_CODE; 258 264 ERROR_PROPAGATE(netif_module_start(netif_client_connection)); 259 265 return EOK; 260 266 }
Note:
See TracChangeset
for help on using the changeset viewer.