Changes in uspace/srv/net/tl/tcp/tcp.c [e417b96:6092b56e] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/tl/tcp/tcp.c
re417b96 r6092b56e 1062 1062 int socket_id; 1063 1063 size_t addrlen; 1064 size_t size;1065 1064 fibril_rwlock_t lock; 1066 1065 ipc_call_t answer; … … 1108 1107 socket_id = SOCKET_GET_SOCKET_ID(call); 1109 1108 res = socket_create(&local_sockets, app_phone, socket_data, &socket_id); 1110 SOCKET_SET_SOCKET_ID(answer, socket_id);1109 *SOCKET_SET_SOCKET_ID(answer) = socket_id; 1111 1110 fibril_rwlock_write_unlock(&lock); 1112 1111 if(res == EOK){ 1113 1112 if(tl_get_ip_packet_dimension(tcp_globals.ip_phone, &tcp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){ 1114 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, ((packet_dimension->content < socket_data->data_fragment_size) ? packet_dimension->content : socket_data->data_fragment_size));1113 *SOCKET_SET_DATA_FRAGMENT_SIZE(answer) = ((packet_dimension->content < socket_data->data_fragment_size) ? packet_dimension->content : socket_data->data_fragment_size); 1115 1114 } 1116 // SOCKET_SET_DATA_FRAGMENT_SIZE(answer, MAX_TCP_FRAGMENT_SIZE);1117 SOCKET_SET_HEADER_SIZE(answer, TCP_HEADER_SIZE);1115 // *SOCKET_SET_DATA_FRAGMENT_SIZE(answer) = MAX_TCP_FRAGMENT_SIZE; 1116 *SOCKET_SET_HEADER_SIZE(answer) = TCP_HEADER_SIZE; 1118 1117 answer_count = 3; 1119 1118 }else{ … … 1167 1166 fibril_rwlock_read_lock(&tcp_globals.lock); 1168 1167 fibril_rwlock_write_lock(&lock); 1169 res = tcp_accept_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_NEW_SOCKET_ID(call), &size, &addrlen); 1170 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size); 1168 res = tcp_accept_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_NEW_SOCKET_ID(call), SOCKET_SET_DATA_FRAGMENT_SIZE(answer), &addrlen); 1171 1169 fibril_rwlock_write_unlock(&lock); 1172 1170 fibril_rwlock_read_unlock(&tcp_globals.lock); 1173 1171 if(res > 0){ 1174 SOCKET_SET_SOCKET_ID(answer, res);1175 SOCKET_SET_ADDRESS_LENGTH(answer, addrlen);1172 *SOCKET_SET_SOCKET_ID(answer) = res; 1173 *SOCKET_SET_ADDRESS_LENGTH(answer) = addrlen; 1176 1174 answer_count = 3; 1177 1175 } … … 1180 1178 fibril_rwlock_read_lock(&tcp_globals.lock); 1181 1179 fibril_rwlock_write_lock(&lock); 1182 res = tcp_send_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_DATA_FRAGMENTS(call), &size, SOCKET_GET_FLAGS(call)); 1183 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size); 1180 res = tcp_send_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_DATA_FRAGMENTS(call), SOCKET_SET_DATA_FRAGMENT_SIZE(answer), SOCKET_GET_FLAGS(call)); 1184 1181 if(res != EOK){ 1185 1182 fibril_rwlock_write_unlock(&lock); … … 1194 1191 fibril_rwlock_read_lock(&tcp_globals.lock); 1195 1192 fibril_rwlock_write_lock(&lock); 1196 res = tcp_send_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_DATA_FRAGMENTS(call), &size, SOCKET_GET_FLAGS(call)); 1197 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size); 1193 res = tcp_send_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_DATA_FRAGMENTS(call), SOCKET_SET_DATA_FRAGMENT_SIZE(answer), SOCKET_GET_FLAGS(call)); 1198 1194 if(res != EOK){ 1199 1195 fibril_rwlock_write_unlock(&lock); … … 1212 1208 fibril_rwlock_read_unlock(&tcp_globals.lock); 1213 1209 if(res > 0){ 1214 SOCKET_SET_READ_DATA_LENGTH(answer, res);1210 *SOCKET_SET_READ_DATA_LENGTH(answer) = res; 1215 1211 answer_count = 1; 1216 1212 res = EOK; … … 1224 1220 fibril_rwlock_read_unlock(&tcp_globals.lock); 1225 1221 if(res > 0){ 1226 SOCKET_SET_READ_DATA_LENGTH(answer, res);1227 SOCKET_SET_ADDRESS_LENGTH(answer, addrlen);1222 *SOCKET_SET_READ_DATA_LENGTH(answer) = res; 1223 *SOCKET_SET_ADDRESS_LENGTH(answer) = addrlen; 1228 1224 answer_count = 3; 1229 1225 res = EOK;
Note:
See TracChangeset
for help on using the changeset viewer.