aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-service-transport.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-10-07 11:17:02 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-10-07 11:17:02 +0000
commit17056f5c94a79ed04ac10680e5d90d6e17f19b95 (patch)
treea77040049cb804e09c65233f91332800015ffa82 /src/transport/gnunet-service-transport.c
parenta129eafa4c349d30f6a1323f854bf31d69bb776f (diff)
downloadgnunet-17056f5c94a79ed04ac10680e5d90d6e17f19b95.tar.gz
gnunet-17056f5c94a79ed04ac10680e5d90d6e17f19b95.zip
- fixing udp address handling for inbound sessions
- fixing some indentation
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r--src/transport/gnunet-service-transport.c71
1 files changed, 28 insertions, 43 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index ba88d71f4..d6be384bd 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -532,52 +532,37 @@ plugin_env_update_metrics (void *cls,
532 */ 532 */
533 533
534static void 534static void
535plugin_env_session_start (void *cls, 535plugin_env_session_start (void *cls, const struct GNUNET_PeerIdentity *peer,
536 const struct GNUNET_PeerIdentity *peer, 536 const char *plugin, const void *address, uint16_t address_len,
537 const char *plugin, 537 struct Session *session, const struct GNUNET_ATS_Information *ats,
538 const void *address, 538 uint32_t ats_count)
539 uint16_t address_len,
540 struct Session *session,
541 const struct GNUNET_ATS_Information *ats,
542 uint32_t ats_count)
543{ 539{
544 struct GNUNET_HELLO_Address *addr; 540 struct GNUNET_HELLO_Address *addr;
545 if (NULL == peer) 541 if (NULL == peer)
546 { 542 {
547 GNUNET_break (0); 543 GNUNET_break(0);
548 return; 544 return;
549 } 545 }
550 if (NULL == plugin) 546 if (NULL == plugin)
551 { 547 {
552 GNUNET_break (0); 548 GNUNET_break(0);
553 return; 549 return;
554 } 550 }
555 if ((address_len != 0) && (NULL == address)) 551 if (NULL == session)
556 { 552 {
557 GNUNET_break (0); 553 GNUNET_break(0);
558 return; 554 return;
559 } 555 }
560 if (NULL == session)
561 {
562 GNUNET_break (0);
563 return;
564 }
565 556
566 addr = GNUNET_HELLO_address_allocate (peer, plugin, address, address_len); 557 addr = GNUNET_HELLO_address_allocate (peer, plugin, address, address_len);
567 if (0 != address_len) 558 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
568 { 559 "Notification from plugin `%s' about new session %p from peer `%s' address `%s'\n",
569 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 560 plugin, session, GNUNET_i2s (peer), GST_plugins_a2s (addr));
570 "Inbound session from plugin `%s' about new session %p from peer `%s' address `%s' does not have address length 0 but %u\n", 561 GST_ats_add_address (addr, session);
571 plugin, session, GNUNET_i2s (peer), GST_plugins_a2s(addr), address_len);
572 }
573 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
574 "Notification from plugin `%s' about new session %p from peer `%s' address `%s'\n",
575 plugin, session, GNUNET_i2s (peer), GST_plugins_a2s(addr));
576 GST_ats_add_address (addr, session);
577 562
578 if (0 < ats_count) 563 if (0 < ats_count)
579 GST_ats_update_metrics (peer, addr, session, ats, ats_count); 564 GST_ats_update_metrics (peer, addr, session, ats, ats_count);
580 GNUNET_free (addr); 565 GNUNET_free(addr);
581} 566}
582 567
583/** 568/**