gateway that only support permanent lease should work

MetacoSA · May 24, 2014 · c9636d7 · c9636d7
1 parent 545e330
commit c9636d7
Showing 1 changed file with 38 additions and 24 deletions.
diff --git a/NBitcoin/Protocol/UPnPLease.cs b/NBitcoin/Protocol/UPnPLease.cs
@@ -101,36 +101,50 @@ INatDevice Device
 									{
 										Description = RuleName
 									};
-									e.Device.CreatePortMap(Mapping);
+									try
+									{
+										e.Device.CreatePortMap(Mapping);
+									}
+									catch(MappingException ex)
+									{
+										if(ex.ErrorCode != 725) //Does not support lease
+											throw;
+
+										Mapping.Lifetime = 0;
+										e.Device.CreatePortMap(Mapping);
+									}
 									NodeServerTrace.Information("Port mapping added " + Mapping);
-									LogNextLeaseRenew();
-									Timer = new Timer(o =>
+									if(Mapping.Lifetime != 0)
 									{
-										if(isDisposed)
-											return;
-										using(Trace.Open(false))
+										LogNextLeaseRenew();
+										Timer = new Timer(o =>
 										{
-											try
-											{
-												e.Device.CreatePortMap(Mapping);
-												NodeServerTrace.Information("Port mapping renewed");
-												LogNextLeaseRenew();
-											}
-											catch(Exception ex)
-											{
-												NodeServerTrace.Error("Error when refreshing the port mapping with UPnP", ex);
-											}
-											finally
+											if(isDisposed)
+												return;
+											using(Trace.Open(false))
 											{
-												Timer.Change((int)CalculateNextRefresh().TotalMilliseconds, Timeout.Infinite);
+												try
+												{
+													e.Device.CreatePortMap(Mapping);
+													NodeServerTrace.Information("Port mapping renewed");
+													LogNextLeaseRenew();
+												}
+												catch(Exception ex)
+												{
+													NodeServerTrace.Error("Error when refreshing the port mapping with UPnP", ex);
+												}
+												finally
+												{
+													Timer.Change((int)CalculateNextRefresh().TotalMilliseconds, Timeout.Infinite);
+												}
 											}
-										}
-									});
-									Device = e.Device;
-									Timer.Change((int)CalculateNextRefresh().TotalMilliseconds, Timeout.Infinite);
+										});
+										Device = e.Device;
+										Timer.Change((int)CalculateNextRefresh().TotalMilliseconds, Timeout.Infinite);
+									}
+									else
+										NodeServerTrace.Error("Bitcoin node ports already used " + string.Join(",", BitcoinPorts), null);
 								}
-								else
-									NodeServerTrace.Error("Bitcoin node ports already used " + string.Join(",", BitcoinPorts), null);
 							}
 							catch(Exception ex)
 							{